From d252555967036602c8b4a97fe8c1fcd15dc6d19b Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Tue, 16 Jan 2024 14:26:36 +0100
Subject: [PATCH 001/143] XWIKI-21785: Bullets are displayed next to flag icons
 in the Languages List in Drawer (#2784)

* Added back style lost when removing the drawer dependency
* Removed some useless style
* Increased specificity for the padding-left of the submenu items so that they would be correctly offset
---
 .../src/main/resources/flamingo/less/drawer.less       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
index 976a06e7028b..d8991e715ad6 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
@@ -147,12 +147,12 @@
 
   // Sub Item =============================================================
   .drawer-dropdown-menu {
-    &.collapsing {
-      /* Overwrite display:none from drawer.js in order to enable the collapse transition. */
-      display: block;
-    }
+    box-sizing: border-box;
+    width: 100%;
+    margin: 0;
+    padding: 0;
 
-    a {
+    a.drawer-menu-item {
       padding-left: @xwiki-drawer-menu-subitem-indent;
     }
   }

From 3f8f843ff4c6b93ce97885b72218834dda04d43b Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Tue, 16 Jan 2024 14:34:11 +0100
Subject: [PATCH 002/143] XWIKI-21784: Long names cause avatar to disappear
 from Drawer and the 'Close the drawer' button to be shifted out of view
 (#2783)

* Removed the max-width set on the avatar that allowed it to get squished down
---
 .../src/main/resources/flamingo/less/drawer.less              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
index d8991e715ad6..a753cecee31d 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/drawer.less
@@ -100,6 +100,8 @@
         border-radius: 50%;
         height: 50px;
         width: 50px;
+        // Overwrite the default for img and avoid squishing down the avatar when the account name is too large
+        max-width: unset;
       }
 
       .brand-links {
@@ -121,6 +123,8 @@
         .brand-user {
           color: @xwiki-drawer-brand-user-color;
           font-weight: 400;
+          // Make sure we wrap the name whatever its length.
+          overflow-wrap: anywhere;
         }
       }
     }

From ad53b39850c25ee62308cae1dd9c4d04d5c42dcf Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Sun, 14 Jan 2024 18:28:45 +0000
Subject: [PATCH 003/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (4484 of 4484 strings)

Translation: XWiki Platform/XWiki Core Resources
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-core-resources/uk/
---
 .../src/main/resources/ApplicationResources_uk.properties        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
index 10421e56415e..74412c49a984 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
@@ -1207,6 +1207,7 @@ platform.web.editors.object.pageTitle=\u0420\u0435\u0434\u0430\u0433\u0443\u0432
 platform.web.editors.class.pageTitle=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u043A\u043B\u0430\u0441\u0443 {0}
 platform.web.editors.rights.pageTitle=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u043F\u0440\u0430\u0432 \u0434\u043E\u0441\u0442\u0443\u043F\u0443 \u0434\u043B\u044F {0}
 platform.web.editors.unknown.pageTitle=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F {0}
+core.editors.content.title=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u043D\u0430\u0437\u0432\u0438 \u0442\u0430 \u0432\u043C\u0456\u0441\u0442\u0443 <a href="{1}">{0}</a>
 core.editors.content.parentField.label=\u0411\u0430\u0442\u044C\u043A\u043E
 core.editors.content.parentField.edit=(\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438)
 core.editors.content.parentField.edit.title=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0431\u0430\u0442\u044C\u043A\u0430

From cc864bed599f8e4d7035708f8abcc5144c134c63 Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Tue, 16 Jan 2024 16:33:09 +0100
Subject: [PATCH 004/143] XWIKI-21009: LiveData alternative to drag controls
 (#2475)

* Improved architecture of the headers
* Updated drag and resize handles to support keyboard interactions
* Use column titles as drag handles
* Added a keyboard alternative for resetting column sizes
* Fixed CSS organization
* Added a new translation key for non-sortable columns
---
 .../resources/ApplicationResources.properties |  41 +++-
 .../ApplicationResources_de.properties        |  37 ++-
 .../ApplicationResources_fr.properties        |  37 ++-
 .../ApplicationResources_ja.properties        |  37 ++-
 .../ApplicationResources_ru.properties        |  37 ++-
 .../ApplicationResources_uk.properties        |  37 ++-
 .../layouts/table/LayoutTableHeaderNames.vue  | 216 ++++++++++--------
 7 files changed, 339 insertions(+), 103 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
index eac1c73b6cb1..7e5a8f25b6e0 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -91,8 +115,9 @@ livedata.pagination.last=Last page
 
 livedata.action.refresh=Refresh
 livedata.action.addEntry=Add entry
-livedata.action.reorder.hint=Drag to reorder
-livedata.action.resizeColumn.hint=Drag to resize. Double click to reset.
+livedata.action.columnName.default.hint=Drag or use arrow keys to reorder this property.
+livedata.action.columnName.sortable.hint=Click to sort the entries based on this property. Drag or use arrow keys to reorder.
+livedata.action.resizeColumn.hint=Drag or use arrow keys to resize. Double click or press escape to reset.
 
 livedata.panel.filter.title=Filter
 livedata.panel.filter.noneFilterable=None of the displayed properties is filterable.
@@ -136,3 +161,15 @@ livedata.footnotes.propertyNotViewable=Displayed when some entries require speci
 livedata.bottombar.noEntries=(No entries)
 
 livedata.error.updateEntriesFailed=Updating the entries failed for an unknown reason.
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=Drag to reorder
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
index e3788dfda44b..aa47f2516201 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -76,7 +100,6 @@ livedata.pagination.next=N\u00E4chste Seite
 livedata.pagination.last=Letzte Seite
 livedata.action.refresh=Aktualisieren
 livedata.action.addEntry=Eintrag hinzuf\u00FCgen
-livedata.action.reorder.hint=Ziehen zum Neuanordnen
 livedata.action.resizeColumn.hint=Zum \u00C4ndern der Gr\u00F6\u00DFe ziehen. Zum Zur\u00FCcksetzen doppelklicken.
 livedata.panel.filter.title=Filter
 livedata.panel.filter.noneFilterable=Keine der angezeigten Eigenschaften ist filterbar.
@@ -109,3 +132,15 @@ livedata.footnotes.computedTitle=Einige Seiten haben einen berechneten Titel. Da
 livedata.footnotes.propertyNotViewable=Wird angezeigt, wenn einige Eintr\u00E4ge spezielle Rechte erfordern, um angezeigt zu werden, und daher Felder nicht aus ihnen extrahiert werden k\u00F6nnen.
 livedata.bottombar.noEntries=(Keine Eintr\u00E4ge)
 livedata.error.updateEntriesFailed=Das Aktualisieren der Eintr\u00E4ge ist aus einem unbekannten Grund fehlgeschlagen.
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=Ziehen zum Neuanordnen
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_fr.properties
index d33a9282f12b..f05705edf079 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_fr.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -72,7 +96,6 @@ livedata.pagination.next=Page suivante
 livedata.pagination.last=Derni\u00E8re page
 livedata.action.refresh=Actualiser
 livedata.action.addEntry=Ajouter un \u00E9l\u00E9ment
-livedata.action.reorder.hint=Glisser pour r\u00E9organiser
 livedata.action.resizeColumn.hint=Glisser pour redimensionner. Double-clic pour r\u00E9initialiser.
 livedata.panel.filter.title=Filtrer
 livedata.panel.filter.noneFilterable=Aucun des \u00E9l\u00E9ments affich\u00E9s ne peut \u00EAtre filtr\u00E9.
@@ -100,3 +123,15 @@ livedata.footnotes.computedTitle=Le titre de certaines pages est calcul\u00E9. F
 ### Missing: livedata.footnotes.propertyNotViewable=Displayed when some entries require special rights to be viewed and thus fields cannot be extracted from them.
 livedata.bottombar.noEntries=(Aucun \u00E9l\u00E9ment)
 livedata.error.updateEntriesFailed=La mise \u00E0 jour des \u00E9l\u00E9ments a \u00E9chou\u00E9 pour une raison inconnue.
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=Glisser pour r\u00E9organiser
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ja.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ja.properties
index 9ea08bcb740e..55e670d050d8 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ja.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ja.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -72,7 +96,6 @@ livedata.pagination.next=\u6B21\u306E\u30DA\u30FC\u30B8
 livedata.pagination.last=\u6700\u5F8C\u306E\u30DA\u30FC\u30B8
 livedata.action.refresh=\u518D\u8AAD\u307F\u8FBC\u307F
 livedata.action.addEntry=\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u8FFD\u52A0
-livedata.action.reorder.hint=\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u4E26\u3079\u66FF\u3048
 livedata.action.resizeColumn.hint=\u30C9\u30E9\u30C3\u30B0\u3067\u30B5\u30A4\u30BA\u3092\u5909\u66F4\u3002\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3067\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059\u3002
 livedata.panel.filter.title=\u30D5\u30A3\u30EB\u30BF\u30FC
 livedata.panel.filter.noneFilterable=\u8868\u793A\u3055\u308C\u3066\u3044\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u306E\u3044\u305A\u308C\u3082\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u3067\u304D\u307E\u305B\u3093\u3002
@@ -100,3 +123,15 @@ livedata.footnotes.computedTitle=\u3044\u304F\u3064\u304B\u306E\u30DA\u30FC\u30B
 livedata.footnotes.propertyNotViewable=\u3044\u304F\u3064\u304B\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u95B2\u89A7\u306B\u7279\u6B8A\u306A\u6A29\u9650\u3092\u5FC5\u8981\u3068\u3059\u308B\u969B\u306B\u8868\u793A\u3057\u305F\u305F\u3081\u3001\u30A8\u30F3\u30C8\u30EA\u30FC\u304B\u3089\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3002
 livedata.bottombar.noEntries=\uFF08\u30A8\u30F3\u30C8\u30EA\u30FC\u304C\u3042\u308A\u307E\u305B\u3093\uFF09
 livedata.error.updateEntriesFailed=\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u66F4\u65B0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u7406\u7531\u306F\u4E0D\u660E\u3067\u3059\u3002
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u4E26\u3079\u66FF\u3048
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
index 84bb15d182bb..19d1ebe3eff0 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -76,7 +100,6 @@ livedata.pagination.next=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F
 livedata.pagination.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u044F\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
 livedata.action.refresh=\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C
 livedata.action.addEntry=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u044C
-livedata.action.reorder.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0440\u044F\u0434\u043E\u043A
 livedata.action.resizeColumn.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0440\u0430\u0437\u043C\u0435\u0440. \u0414\u0432\u0430\u0436\u0434\u044B \u0449\u0435\u043B\u043A\u043D\u0438\u0442\u0435 \u0434\u043B\u044F \u0441\u0431\u0440\u043E\u0441\u0430.
 livedata.panel.filter.title=\u0424\u0438\u043B\u044C\u0442\u0440
 livedata.panel.filter.noneFilterable=\u041D\u0438 \u043E\u0434\u043D\u043E \u0438\u0437 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u043C\u044B\u0445 \u0441\u0432\u043E\u0439\u0441\u0442\u0432 \u043D\u0435 \u0444\u0438\u043B\u044C\u0442\u0440\u0443\u0435\u0442\u0441\u044F.
@@ -109,3 +132,15 @@ livedata.footnotes.computedTitle=\u041D\u0435\u043A\u043E\u0442\u043E\u0440\u044
 livedata.footnotes.propertyNotViewable=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044F, \u043A\u043E\u0433\u0434\u0430 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0437\u0430\u043F\u0438\u0441\u0438 \u0442\u0440\u0435\u0431\u0443\u044E\u0442 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\u0440\u0430\u0432 \u0434\u043B\u044F \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u0438\u0437 \u043D\u0438\u0445 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0438\u0437\u0432\u043B\u0435\u0447\u044C \u043F\u043E\u043B\u044F.
 livedata.bottombar.noEntries=(\u041D\u0435\u0442 \u0437\u0430\u043F\u0438\u0441\u0435\u0439)
 livedata.error.updateEntriesFailed=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438 \u043F\u043E \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E\u0439 \u043F\u0440\u0438\u0447\u0438\u043D\u0435.
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0440\u044F\u0434\u043E\u043A
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
index f32a878fe56e..a961224dde16 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
@@ -18,6 +18,30 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+###############################################################################
+# XWiki Core localization
+#
+# This contains the translations of the module in the default language
+# (generally English).
+#
+# See https://dev.xwiki.org/xwiki/bin/view/Community/L10N/Conventions/ for more details about about
+# translation key naming.
+#
+# Comments: it's possible to add some detail about a key to make easier to
+#   translate it by adding a comment before it. To make sure a comment is not
+#   assigned to the following key use at least three sharps (###) for the comment
+#   or after it.
+#
+# Deprecated keys:
+#   * when deleting a key it should be moved to deprecated section at the end
+#     of the file (between #@deprecatedstart and #@deprecatedend) and associated to the
+#     first version in which it started to be deprecated
+#   * when renaming a key, it should be moved to the same deprecated section
+#     and a comment should be added with the following syntax:
+#     #@deprecated new.key.name
+#     old.key.name=Some translation
+###############################################################################
+
 #
 # Translation keys for the rendering macro.
 #
@@ -76,7 +100,6 @@ livedata.pagination.next=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0430 \u0441
 livedata.pagination.last=\u041E\u0441\u0442\u0430\u043D\u043D\u044F \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0430
 livedata.action.refresh=\u041E\u043D\u043E\u0432\u0438\u0442\u0438
 livedata.action.addEntry=\u0414\u043E\u0434\u0430\u0442\u0438 \u0437\u0430\u043F\u0438\u0441
-livedata.action.reorder.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0440\u044F\u0434\u043E\u043A, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C
 livedata.action.resizeColumn.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u0440\u043E\u0437\u043C\u0456\u0440, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C. \u041A\u043B\u0430\u0446\u043D\u0456\u0442\u044C \u0434\u0432\u0456\u0447\u0456, \u0449\u043E\u0431 \u0441\u043A\u0438\u043D\u0443\u0442\u0438.
 livedata.panel.filter.title=\u0424\u0456\u043B\u044C\u0442\u0440
 livedata.panel.filter.noneFilterable=\u0416\u043E\u0434\u043D\u0443 \u0437 \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0445 \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0435\u0439 \u043D\u0435 \u043C\u043E\u0436\u043D\u0430 \u0432\u0456\u0434\u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u0442\u0438.
@@ -109,3 +132,15 @@ livedata.footnotes.computedTitle=\u0414\u0435\u044F\u043A\u0456 \u0441\u0442\u04
 livedata.footnotes.propertyNotViewable=\u0412\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u0454\u0442\u044C\u0441\u044F, \u043A\u043E\u043B\u0438 \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0433\u043B\u044F\u0434\u0443 \u0434\u0435\u044F\u043A\u0438\u0445 \u0437\u0430\u043F\u0438\u0441\u0456\u0432 \u043F\u043E\u0442\u0440\u0456\u0431\u043D\u0456 \u0441\u043F\u0435\u0446\u0456\u0430\u043B\u044C\u043D\u0456 \u043F\u0440\u0430\u0432\u0430, \u0442\u043E\u043C\u0443 \u0437 \u043D\u0438\u0445 \u043D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043E\u0442\u0440\u0438\u043C\u0430\u0442\u0438 \u043F\u043E\u043B\u044F.
 livedata.bottombar.noEntries=(\u041D\u0435\u043C\u0430\u0454 \u0437\u0430\u043F\u0438\u0441\u0456\u0432)
 livedata.error.updateEntriesFailed=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044F \u043E\u043D\u043E\u0432\u0438\u0442\u0438 \u0437\u0430\u043F\u0438\u0441\u0438 \u0437 \u043D\u0435\u0432\u0456\u0434\u043E\u043C\u043E\u0457 \u043F\u0440\u0438\u0447\u0438\u043D\u0438.
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+#######################################
+## until 16.0.0
+#######################################
+#@deprecated livedata.action.columnName.default.hint
+livedata.action.reorder.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0440\u044F\u0434\u043E\u043A, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
index 7a6332642c4e..8bf3921fa7cf 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
@@ -58,45 +58,41 @@
       v-show="logic.isPropertyVisible(property.id)"
     >
       <!-- Wrapper for the column header -->
-      <div
-        class="column-name"
-        @click="sort(property)"
-      >
-        <!--
-          Specify the handle to drag properties.
-          Use the stop propagation modifier on click event
-          to prevent sorting the column unintentionally.
-        -->
-        <div
-          role="presentation"
-          class="handle"
-          :title="$t('livedata.action.reorder.hint')"
-          @click.stop
-        >
-          <XWikiIcon :icon-descriptor="{name: 'text_align_justify'}"/>
-        </div>
+      <div class="column-name">
         <!-- Property Name -->
-        <span class="property-name">{{ property.name }}</span>
+        <button 
+          class="property-name handle"
+          @click="sort(property)"
+          @keydown.left="keyboardDragNDrop($event, -1)"
+          @keydown.right="keyboardDragNDrop($event, 1)"
+          :title="logic.isPropertySortable(property.id) ?
+            $t('livedata.action.columnName.sortable.hint') :
+            $t('livedata.action.columnName.default.hint')"
+        >
+          {{ property.name }}
+          <!--
+            Sort icon
+            Only show the icon for the first-level sort property
+          -->
+          <XWikiIcon
+            v-if="logic.isPropertySortable(property.id)"
+            :icon-descriptor="{name: isFirstSortLevel(property) && firstSortLevel.descending? 'caret-down': 'caret-up'}"
+            :class="['sort-icon',  isFirstSortLevel(property)? 'sorted': '']"/>
+        </button>
+
         <!--
-          Sort icon
-          Only show the icon for the first-level sort property
+          Specify the handle to resize properties
         -->
-        <XWikiIcon
-          v-if="logic.isPropertySortable(property.id)"
-          :icon-descriptor="{name: isFirstSortLevel(property) && firstSortLevel.descending? 'caret-down': 'caret-up'}"
-          :class="['sort-icon',  isFirstSortLevel(property)? 'sorted': '']"/>
+        <button class="resize-handle btn btn-xs btn-default" :title="$t('livedata.action.resizeColumn.hint')"
+          v-mousedownmove="mouseResizeColumnInit"
+          @mousedownmove="mouseResizeColumn"
+          @keydown.left="keyboardResizeColumn($event, -10)"
+          @keydown.right="keyboardResizeColumn($event, 10)"
+          @dblclick="resetColumnSize"
+          @keydown.esc="resetColumnSize"
+        >
+        </button>
       </div>
-      <!--
-        Resize handle
-        Use the stop propagation modifier on click event
-        to prevent sorting the column unintentionally.
-      -->
-      <div role="presentation" class="resize-handle" :title="$t('livedata.action.resizeColumn.hint')"
-        v-mousedownmove="resizeColumnInit"
-        @mousedownmove="resizeColumn"
-        @click.stop
-        @dblclick="resetColumnSize"
-      ></div>
     </th>
 
   </XWikiDraggable>
@@ -169,8 +165,8 @@ export default {
         so that it matches the true property order
         When selection is disabled (and the select-entry-all component hidden)
         we don't need to readjust the offset of the indexes
-        as Vue handily creates a html comment where the component shoud be
-        So that it does not messes up with indexes
+        as Vue handily creates a html comment where the component should be
+        So that it does not mess up with indexes
       */
       this.logic.reorderProperty(e.moved.oldIndex - 1, e.moved.newIndex - 1);
     },
@@ -182,13 +178,32 @@ export default {
       }
     },
 
-    resizeColumnInit (e) {
+    keyboardDragNDrop(e, deltaIndex) {
+      let handles = e.currentTarget.closest('tr').querySelectorAll('.handle');
+      let oldIndex = Array.from(handles).indexOf(e.currentTarget);
+      let newIndex = oldIndex + deltaIndex;
+      if (newIndex >= handles.length) {
+        this.logic.reorderProperty(oldIndex, newIndex - handles.length);
+      } else if (newIndex <= -1) {
+        this.logic.reorderProperty(oldIndex, handles.length + newIndex);
+      } else {
+        this.logic.reorderProperty(oldIndex, newIndex);
+      }
+      this.$nextTick(() => {
+          handles[oldIndex].focus();
+      });
+    },
+
+    mouseResizeColumnInit (e) {
       const th = e.currentTarget.closest("th");
       e.data.leftColumn = th.querySelector(".column-name");
       e.data.leftColumnBaseWidth = e.data.leftColumn.getBoundingClientRect()?.width;
       e.data.rightColumn = this.getNextVisibleProperty(th)?.querySelector(".column-name");
       e.data.rightColumnBaseWidth = e.data.rightColumn?.getBoundingClientRect()?.width;
+      this.resizeColumnInit(th);
+    },
 
+    resizeColumnInit (th) {
       // Give all column names a fixed width so that relative widths don't change when resizing (in case the current
       // widths are not the actual column widths).
       // First, collect all widths, then set them all to avoid that due to the first values being set the other values
@@ -205,19 +220,37 @@ export default {
       }
     },
 
-    resizeColumn (e) {
-      const offsetX = e.clientX - e.data.clickEvent.clientX;
+    resizeColumn(offsetX, leftColumn, rightColumn, leftColumnBaseWidth, rightColumnBaseWidth) {
       // Resize left column
-      const leftColumnWidth = e.data.leftColumnBaseWidth + offsetX;
-      e.data.leftColumn.style.width = `${leftColumnWidth}px`;
-
+      let leftColumnWidth = leftColumnBaseWidth + offsetX;
+      leftColumn.style.width = `${leftColumnWidth}px`;
       // Resize right column
-      if (e.data.rightColumn) {
-        const rightColumnWidth = e.data.rightColumnBaseWidth - offsetX;
-        e.data.rightColumn.style.width = `${rightColumnWidth}px`;
+      if (rightColumn) {
+          let rightColumnWidth = rightColumnBaseWidth - offsetX;
+          rightColumn.style.width = `${rightColumnWidth}px`;
       }
     },
 
+    mouseResizeColumn (e) {
+      let offsetX = e.clientX - e.data.clickEvent.clientX;
+      let leftColumn = e.data.leftColumn;
+      let rightColumn = e.data.rightColumn;
+      let leftColumnBaseWidth = e.data.leftColumnBaseWidth;
+      let rightColumnBaseWidth = e.data.rightColumnBaseWidth;
+      this.resizeColumn(offsetX, leftColumn, rightColumn, leftColumnBaseWidth, rightColumnBaseWidth);
+    },
+
+    keyboardResizeColumn (e, offsetX) {
+      const th = e.currentTarget.closest("th");
+      this.resizeColumnInit(th);
+
+      let leftColumn = th.querySelector(".column-name");
+      let leftColumnBaseWidth = leftColumn.getBoundingClientRect()?.width;
+      let rightColumn = this.getNextVisibleProperty(th)?.querySelector(".column-name");
+      let rightColumnBaseWidth = rightColumn?.getBoundingClientRect()?.width;
+      this.resizeColumn(offsetX, leftColumn, rightColumn, leftColumnBaseWidth, rightColumnBaseWidth);
+    },
+    
     resetColumnSize (e) {
       // Reset all column sizes as resizing a single column sets sizes for all columns.
       for (const column of e.currentTarget.closest("tr").querySelectorAll(".column-name")) {
@@ -236,44 +269,53 @@ export default {
 .layout-table th.draggable-item {
   display: table-cell;
   min-width: 4rem;
-  overflow: hidden;
+  padding: 8px 0 8px 4px;
 }
 
 .layout-table .column-name {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-items: center;
   cursor: pointer;
-  /* Ensure that the name is never smaller than the width of the column, i.e., it always fills the available space even
-   when the column has been resized to a smaller width that is prevented by some table cell. */
-  min-width: 100%;
-  position: relative;
+  display: flex;
+  justify-content: space-between;
 }
 
-.layout-table .handle {
-  height: 100%;
-  margin-left: -@table-cell-padding;
-  padding: 0 @table-cell-padding;
-  color: @text-color;
-  background-color: @xwiki-page-content-bg;
-  cursor: pointer; /* IE */
-  cursor: grab;
-  opacity: 0;
-  position: absolute;
+.layout-table .resize-handle {
+  padding: 0;
+  cursor: col-resize;
+  min-width: 0;
+  width: 0;
+  border-width: 2px;
+  border-radius: 0;
+  margin-left: 2px;
 }
-.layout-table .column-name:hover .handle {
-  opacity: 0.8;
-  transition: opacity 0.2s;
+
+.layout-table .column-name:focus-within .resize-handle,
+.layout-table .column-name:hover .resize-handle {
+  border-color: @text-muted;
+  border-width: 3px;
+  margin-left: 0;
+}
+
+.layout-table .draggable-item:not(:last-child) .resize-handle {
+  margin-right: -2px;
 }
-.layout-table .handle .fa {
-  vertical-align: middle;
+
+.layout-table .draggable-item:not(:last-child) .column-name:focus-within .resize-handle,
+.layout-table .draggable-item:not(:last-child) .column-name:hover .resize-handle {
+  margin-right: -3px;
 }
 
 .layout-table .property-name {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  background: transparent;
+  border: 0;
+  width: 100%;
+  text-align: left;
+}
+
+.draggable-item .property-name.handle  {
+  opacity: 1;
 }
 
 .layout-table .sort-icon {
@@ -281,10 +323,17 @@ export default {
   opacity: 0;
   padding-left: @table-cell-padding;
 }
+
+.layout-table .property-name .sort-icon {
+  vertical-align: baseline;
+}
+
 .layout-table .sort-icon.sorted {
   opacity: 1;
 }
-.layout-table .column-name:hover .sort-icon:not(.sorted) {
+
+.layout-table .column-name:hover .sort-icon:not(.sorted),
+.layout-table .column-name:focus-within .sort-icon:not(.sorted) {
   opacity: 0.5;
 }
 
@@ -292,36 +341,11 @@ export default {
   position: relative;
 }
 
-.layout-table .resize-handle {
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  bottom: 0px;
-  transform: translateX(50%);
-  width: 10px;
-  background-color: transparent;
-  cursor: ew-resize;
-  user-select: none;
-  z-index: 100;
-
-  &:hover {
-    background-color: @breadcrumb-bg;
-  }
-}
-
 /* Responsive mode */
 @media screen and (max-width: @screen-xs-max) {
   .layout-table th.draggable-item {
     /* Overwrite the draggable-item display in order to show the property names (table header) as a column. */
     display: block;
-
-    .handle {
-      /* Always show the drag handler because hover is not available on mobile. */
-      opacity: 1;
-      /* Display the drag handler next to the property name to avoid always hiding it. */
-      position: static;
-    }
-
     /* Trim long property names. */
     .property-name {
       white-space: nowrap;

From f843e98bab30cbf96144862e54def7891d225126 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 16 Jan 2024 16:33:28 +0100
Subject: [PATCH 005/143] XWIKI-21801: Duplicate versions in history of
 documents not based on JRCS Co-authored-by: trrenty <trrenty@gmail.com>

---
 .../DocumentInstanceOutputFilterStream.java   |  11 --
 .../com/xpn/xwiki/test/MockitoOldcore.java    | 149 ++++++++++--------
 .../filter/documentwithattachment1content.xml |   9 +-
 .../filter/documentwithattachment2content.xml |   9 +-
 4 files changed, 100 insertions(+), 78 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
index d8e6a5e2b41c..ec2ed1c2e341 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
@@ -46,7 +46,6 @@
 import com.xpn.xwiki.doc.XWikiAttachment;
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.doc.XWikiDocumentArchive;
-import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
 
 /**
  * @version $Id$
@@ -252,16 +251,6 @@ private void maybeSaveDocument() throws FilterException
 
                 xcontext.getWiki().saveDocument(document, inputDocument.getComment(), inputDocument.isMinorEdit(),
                     xcontext);
-
-                if (!hasJRCSHistory) {
-                    // Not a JRCS based history document
-                    // Explicitly update the history because the store won't do it automatically (because
-                    // metadata/content dirty is false)
-                    XWikiVersioningStoreInterface versioningStore = document.getVersioningStore(xcontext);
-                    if (versioningStore != null) {
-                        versioningStore.updateXWikiDocArchive(document, true, xcontext);
-                    }
-                }
             } else {
                 // Forget the input history to let the store do its standard job
                 document.setDocumentArchive((XWikiDocumentArchive) null);
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/test/MockitoOldcore.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/test/MockitoOldcore.java
index 44ff8f2c0018..99cab4371cd5 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/test/MockitoOldcore.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/test/MockitoOldcore.java
@@ -695,35 +695,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable
                     reference = reference.setWikiReference(xcontext.getWikiReference());
                 }
 
-                if (document.isContentDirty() || document.isMetaDataDirty()) {
-                    document.setDate(new Date());
-                    if (document.isContentDirty()) {
-                        document.setContentUpdateDate(new Date());
-                        document.setContentAuthorReference(document.getAuthorReference());
-                    }
-                    document.incrementVersion();
-
-                    document.setContentDirty(false);
-                    document.setMetaDataDirty(false);
-
-                    if (supportRevisionStore) {
-                        // Save the document in the document archive.
-                        getMockVersioningStore().updateXWikiDocArchive(document, true, xcontext);
-                    }
-                }
-                document.setNew(false);
-                document.setStore(getMockStore());
-
-                // Make sure the document is not restricted.
-                document.setRestricted(false);
-
-                XWikiDocument savedDocument = document.clone();
-
-                documents.put(document.getDocumentReferenceWithLocale(), savedDocument);
-
-
-                // Set the document as it's original document
-                savedDocument.setOriginalDocument(savedDocument.clone());
+                saveDocument(reference, document, xcontext);
 
                 return null;
             }
@@ -881,27 +853,6 @@ public Void answer(InvocationOnMock invocation) throws Throwable
                     document.setComment(StringUtils.defaultString(comment));
                     document.setMinorEdit(minorEdit);
 
-                    if (document.isContentDirty() || document.isMetaDataDirty()) {
-                        Date ndate = new Date();
-                        document.setDate(ndate);
-                        if (document.isContentDirty()) {
-                            document.setContentUpdateDate(ndate);
-                            DocumentAuthors authors = document.getAuthors();
-                            authors.setContentAuthor(authors.getEffectiveMetadataAuthor());
-                        }
-                        document.incrementVersion();
-
-                        document.setContentDirty(false);
-                        document.setMetaDataDirty(false);
-
-                        // Save the document in the document archive.
-                        if (supportRevisionStore) {
-                            getMockVersioningStore().updateXWikiDocArchive(document, true, xcontext);
-                        }
-                    }
-                    document.setNew(false);
-                    document.setStore(getMockStore());
-
                     XWikiDocument previousDocument = documents.get(document.getDocumentReferenceWithLocale());
 
                     if (previousDocument != null && previousDocument != document) {
@@ -920,28 +871,28 @@ public Void answer(InvocationOnMock invocation) throws Throwable
                         document.setOriginalDocument(originalDocument);
                     }
 
-                    // Make sure the document is not restricted.
-                    document.setRestricted(false);
+                    saveDocument(document.getDocumentReferenceWithLocale(), document, xcontext);
 
-                    XWikiDocument savedDocument = document.clone();
+                    XWikiDocument newOriginal = document.getOriginalDocument();
 
-                    documents.put(document.getDocumentReferenceWithLocale(), savedDocument);
+                    try {
+                        document.setOriginalDocument(originalDocument);
 
-                    if (isNew) {
                         if (notifyDocumentCreatedEvent) {
-                            getObservationManager().notify(new DocumentCreatedEvent(document.getDocumentReference()),
-                                document, getXWikiContext());
-                        }
-                    } else {
-                        if (notifyDocumentUpdatedEvent) {
-                            getObservationManager().notify(new DocumentUpdatedEvent(document.getDocumentReference()),
-                                document, getXWikiContext());
+                            if (isNew) {
+                                getObservationManager().notify(
+                                    new DocumentCreatedEvent(document.getDocumentReference()), document,
+                                    getXWikiContext());
+                            } else {
+                                getObservationManager().notify(
+                                    new DocumentUpdatedEvent(document.getDocumentReference()), document,
+                                    getXWikiContext());
+                            }
                         }
+                    } finally {
+                        document.setOriginalDocument(newOriginal);
                     }
 
-                    // Set the document as it's original document
-                    savedDocument.setOriginalDocument(savedDocument.clone());
-
                     return null;
                 }
             }).when(getSpyXWiki()).saveDocument(anyXWikiDocument(), any(String.class), anyBoolean(), anyXWikiContext());
@@ -1181,6 +1132,74 @@ public String answer(InvocationOnMock invocation) throws Throwable
         }
     }
 
+    private void saveDocument(DocumentReference reference, XWikiDocument document, XWikiContext xcontext)
+        throws XWikiException
+    {
+        boolean supportRevisionStore = this.componentManager.hasComponent(XWikiDocumentFilterUtils.class);
+
+        if (document.isContentDirty() || document.isMetaDataDirty()) {
+            document.setDate(new Date());
+            if (document.isContentDirty()) {
+                document.setContentUpdateDate(new Date());
+                DocumentAuthors authors = document.getAuthors();
+                authors.setContentAuthor(authors.getEffectiveMetadataAuthor());
+            }
+            document.incrementVersion();
+
+            document.setContentDirty(false);
+            document.setMetaDataDirty(false);
+
+            if (supportRevisionStore) {
+                // Save the document in the document archive.
+                getMockVersioningStore().updateXWikiDocArchive(document, true, xcontext);
+            }
+        } else {
+            if (supportRevisionStore) {
+                if (document.getDocumentArchive() != null) {
+                    getMockVersioningStore().saveXWikiDocArchive(document.getDocumentArchive(), false, xcontext);
+
+                    if (!containsVersion(document, document.getRCSVersion(), xcontext)) {
+                        getMockVersioningStore().updateXWikiDocArchive(document, false, xcontext);
+                    }
+                } else {
+                    try {
+                        document.getDocumentArchive(xcontext);
+
+                        if (!containsVersion(document, document.getRCSVersion(), xcontext)) {
+                            getMockVersioningStore().updateXWikiDocArchive(document, false, xcontext);
+                        }
+                    } catch (XWikiException e) {
+                        // this is a non critical error
+                    }
+                }
+            }
+        }
+        document.setNew(false);
+        document.setStore(getMockStore());
+
+        // Make sure the document is not restricted.
+        document.setRestricted(false);
+
+        XWikiDocument savedDocument = document.clone();
+
+        documents.put(document.getDocumentReferenceWithLocale(), savedDocument);
+
+        // Set the document as it's original document
+        savedDocument.setOriginalDocument(savedDocument.clone());
+    }
+
+    private boolean containsVersion(XWikiDocument doc, Version targetversion, XWikiContext context)
+        throws XWikiException
+    {
+        for (Version version : doc.getRevisions(context)) {
+            if (version.equals(targetversion)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     protected DocumentReference resolveDocument(String documentName) throws ComponentLookupException
     {
         DocumentReferenceResolver<String> resolver =
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment1content.xml b/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment1content.xml
index 28c6d435927d..3d5891effb62 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment1content.xml
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment1content.xml
@@ -36,7 +36,14 @@
                 </entry>
                 <entry>
                   <string>syntax</string>
-                  <null/>
+                  <org.xwiki.rendering.syntax.Syntax>
+                    <type>
+                      <name>XWiki</name>
+                      <id>xwiki</id>
+                      <variants class="empty-list"/>
+                    </type>
+                    <version>2.1</version>
+                  </org.xwiki.rendering.syntax.Syntax>
                 </entry>
                 <entry>
                   <string>hidden</string>
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment2content.xml b/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment2content.xml
index 40393fe4b7c2..77e524ef589e 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment2content.xml
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/resources/filter/documentwithattachment2content.xml
@@ -36,7 +36,14 @@
                 </entry>
                 <entry>
                   <string>syntax</string>
-                  <null/>
+                  <org.xwiki.rendering.syntax.Syntax>
+                    <type>
+                      <name>XWiki</name>
+                      <id>xwiki</id>
+                      <variants class="empty-list"/>
+                    </type>
+                    <version>2.1</version>
+                  </org.xwiki.rendering.syntax.Syntax>
                 </entry>
                 <entry>
                   <string>hidden</string>

From c5efc1e519e710afdf3c5f40c0fcc300ad77149f Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael.hamann@xwiki.com>
Date: Tue, 16 Jan 2024 16:42:59 +0100
Subject: [PATCH 006/143] XWIKI-21553: Do not override existing documents on
 user action (#2790)

* Introduce a new listener to cancel any save that would delete the document.
* Add a unit test.
---
 .../document/DocumentOverrideListener.java    | 77 +++++++++++++++++
 .../main/resources/META-INF/components.txt    |  1 +
 .../DocumentOverrideListenerTest.java         | 86 +++++++++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/document/DocumentOverrideListener.java
 create mode 100644 xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/document/DocumentOverrideListener.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/document/DocumentOverrideListener.java
new file mode 100644
index 000000000000..74c8ae3dfb4c
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/document/DocumentOverrideListener.java
@@ -0,0 +1,77 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.internal.document;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.observation.AbstractEventListener;
+import org.xwiki.observation.event.CancelableEvent;
+import org.xwiki.observation.event.Event;
+
+import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.internal.event.UserUpdatingDocumentEvent;
+
+/**
+ * Cancel any save that tries to save a new document if the document already exists.
+ *
+ * <p>
+ *     This can happen when the context document is set to an empty document because the user doesn't have view right,
+ *     but the user still has, e.g., edit right. In this situation, the user would still be able to to save but it is
+ *     hard to imagine a scenario where this would make sense. This listener therefore cancels the save in this
+ *     situation.
+ * </p>
+ *
+ * @version $Id$
+ * @since 14.10.21
+ * @since 15.5.5
+ * @since 15.10.6
+ */
+@Component
+@Singleton
+@Named(DocumentOverrideListener.NAME)
+public class DocumentOverrideListener extends AbstractEventListener
+{
+    /**
+     * The unique identifier of the listener.
+     */
+    public static final String NAME = "org.xwiki.internal.document.DocumentOverrideListener";
+
+    /**
+     * The default constructor.
+     */
+    public DocumentOverrideListener()
+    {
+        super(NAME, new UserUpdatingDocumentEvent());
+    }
+
+    @Override
+    public void onEvent(Event event, Object source, Object data)
+    {
+        XWikiDocument document = (XWikiDocument) source;
+        XWikiDocument originalDocument = document.getOriginalDocument();
+
+        if (document.isNew() && originalDocument != null && !originalDocument.isNew()) {
+            ((CancelableEvent) event).cancel(
+                "The document already exists but the document to be saved is marked as new.");
+        }
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt
index ba8942e0b3ae..0f4b59d7f156 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt
@@ -278,3 +278,4 @@ org.xwiki.security.authservice.script.AuthServiceScriptService
 org.xwiki.model.validation.edit.XWikiDocumentLockEditConfirmationChecker
 org.xwiki.evaluation.internal.DefaultObjectEvaluator
 org.xwiki.evaluation.internal.VelocityObjectPropertyEvaluator
+org.xwiki.internal.document.DocumentOverrideListener
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
new file mode 100644
index 000000000000..e5f1f45e1268
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
@@ -0,0 +1,86 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.internal.document;
+
+import org.junit.jupiter.api.Test;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.observation.internal.DefaultObservationManager;
+import org.xwiki.test.annotation.ComponentList;
+
+import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.test.MockitoOldcore;
+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;
+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;
+import com.xpn.xwiki.test.reference.ReferenceComponentList;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Unit tests for {@link DocumentOverrideListener}.
+ *
+ * @version $Id$
+ */
+@OldcoreTest(mockXWiki = false)
+@ReferenceComponentList
+@ComponentList({ DefaultObservationManager.class, DocumentOverrideListener.class })
+class DocumentOverrideListenerTest
+{
+    @InjectMockitoOldcore
+    private MockitoOldcore oldcore;
+
+    @Test
+    void savingNewDocument() throws Exception
+    {
+        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
+        XWikiDocument document = new XWikiDocument(documentReference);
+        this.oldcore.getSpyXWiki().checkSavingDocument(mock(), document, this.oldcore.getXWikiContext());
+    }
+
+    @Test
+    void savingExistingDocument() throws Exception
+    {
+        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
+        XWikiDocument document = new XWikiDocument(documentReference);
+        this.oldcore.getSpyXWiki().saveDocument(document, this.oldcore.getXWikiContext());
+        document = this.oldcore.getSpyXWiki().getDocument(documentReference, this.oldcore.getXWikiContext());
+        assertFalse(document.isNew());
+        this.oldcore.getSpyXWiki().checkSavingDocument(mock(), document, this.oldcore.getXWikiContext());
+    }
+
+    @Test
+    void savingOverridingExistingDocument() throws Exception
+    {
+        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
+        DocumentReference userReference = new DocumentReference("wiki", "XWiki", "user");
+        XWikiDocument document = new XWikiDocument(documentReference);
+        this.oldcore.getSpyXWiki().saveDocument(document, this.oldcore.getXWikiContext());
+        XWikiDocument newDocument = new XWikiDocument(documentReference);
+        XWikiException exception = assertThrows(XWikiException.class,
+            () -> this.oldcore.getSpyXWiki()
+                .checkSavingDocument(userReference, newDocument, this.oldcore.getXWikiContext()));
+        assertEquals("Error number 9001 in 9: User [wiki:XWiki.user] has been denied the right to save the "
+            + "document [wiki:space.page]. Reason: [The document already exists but the document to be saved is marked "
+            + "as new.]", exception.getMessage());
+    }
+}

From 01863eb6ccd361004288bc91a92261b3f23fd9c0 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael.hamann@xwiki.com>
Date: Tue, 16 Jan 2024 16:53:17 +0100
Subject: [PATCH 007/143] XWIKI-21553: Do not override existing documents on
 user action

* Remove mock() call not available in 14.10.x
* Use constants for user and document reference in the test

(cherry picked from commit f140102575cbdbb5a517caf51270fa669df23667)
---
 .../DocumentOverrideListenerTest.java         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
index e5f1f45e1268..37155d90d7d9 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
@@ -46,39 +46,39 @@
 @ComponentList({ DefaultObservationManager.class, DocumentOverrideListener.class })
 class DocumentOverrideListenerTest
 {
+    private static final DocumentReference DOCUMENT_REFERENCE = new DocumentReference("wiki", "space", "page");
+
+    private static final DocumentReference USER_REFERENCE = new DocumentReference("wiki", "XWiki", "user");
+
     @InjectMockitoOldcore
     private MockitoOldcore oldcore;
 
     @Test
     void savingNewDocument() throws Exception
     {
-        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
-        XWikiDocument document = new XWikiDocument(documentReference);
-        this.oldcore.getSpyXWiki().checkSavingDocument(mock(), document, this.oldcore.getXWikiContext());
+        XWikiDocument document = new XWikiDocument(DOCUMENT_REFERENCE);
+        this.oldcore.getSpyXWiki().checkSavingDocument(USER_REFERENCE, document, this.oldcore.getXWikiContext());
     }
 
     @Test
     void savingExistingDocument() throws Exception
     {
-        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
-        XWikiDocument document = new XWikiDocument(documentReference);
+        XWikiDocument document = new XWikiDocument(DOCUMENT_REFERENCE);
         this.oldcore.getSpyXWiki().saveDocument(document, this.oldcore.getXWikiContext());
-        document = this.oldcore.getSpyXWiki().getDocument(documentReference, this.oldcore.getXWikiContext());
+        document = this.oldcore.getSpyXWiki().getDocument(DOCUMENT_REFERENCE, this.oldcore.getXWikiContext());
         assertFalse(document.isNew());
-        this.oldcore.getSpyXWiki().checkSavingDocument(mock(), document, this.oldcore.getXWikiContext());
+        this.oldcore.getSpyXWiki().checkSavingDocument(USER_REFERENCE, document, this.oldcore.getXWikiContext());
     }
 
     @Test
     void savingOverridingExistingDocument() throws Exception
     {
-        DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
-        DocumentReference userReference = new DocumentReference("wiki", "XWiki", "user");
-        XWikiDocument document = new XWikiDocument(documentReference);
+        XWikiDocument document = new XWikiDocument(DOCUMENT_REFERENCE);
         this.oldcore.getSpyXWiki().saveDocument(document, this.oldcore.getXWikiContext());
-        XWikiDocument newDocument = new XWikiDocument(documentReference);
+        XWikiDocument newDocument = new XWikiDocument(DOCUMENT_REFERENCE);
         XWikiException exception = assertThrows(XWikiException.class,
             () -> this.oldcore.getSpyXWiki()
-                .checkSavingDocument(userReference, newDocument, this.oldcore.getXWikiContext()));
+                .checkSavingDocument(USER_REFERENCE, newDocument, this.oldcore.getXWikiContext()));
         assertEquals("Error number 9001 in 9: User [wiki:XWiki.user] has been denied the right to save the "
             + "document [wiki:space.page]. Reason: [The document already exists but the document to be saved is marked "
             + "as new.]", exception.getMessage());

From b759f2dcc1d5214d6ecd30954caf08da0d086b7e Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 17 Jan 2024 08:54:31 +0100
Subject: [PATCH 008/143] [misc] Improve comments

---
 .../src/main/resources/xwiki.properties.vm                 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
index 978f84db299a..9e74537943db 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
@@ -76,8 +76,8 @@
 #-# The directory used to store persistent data (data that should persist across server restarts). This is an
 #-# important directory containing important data and thus it should never be deleted (it should be backed-up along
 #-# with the database).
-#-# For example this is where the Extension Manager stores downloaded extensions if the extension.localRepository
-#-# property isn't configured.
+#-# For example this is where the Extension Manager stores downloaded extensions (unless extension.localRepository
+#-# property is configured to a different location).
 #-#
 #-# You can set:
 #-# * an absolute path (recommended)
@@ -573,8 +573,7 @@ extension.repositories = $extensionRepository
 #-# [Since 2.5]
 #-# The directory where extensions are stored after being downloaded.
 #-#
-#-# The default is extension/repository in whatever is the general persistent directory.
-#-# See container.persistentDirectory.
+#-# The default is <environment.permanentDirectory path>/extension/repository.
 # extension.localRepository=extension/repository
 
 #-# [Since 3.4]

From db9af9431ba7152a9b2b9c1191af99820b2da6bd Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Wed, 17 Jan 2024 09:21:36 +0100
Subject: [PATCH 009/143] XWIKI-18733: Replace the Affected Children livetable
 of the Delete page with a LiveData (#1691)

---
 .../src/main/resources/flamingo/delete.vm     | 36 ++++++++++---------
 .../flamingo/test/docker/DeletePageIT.java    | 16 +++++++++
 .../ui/po/DeletePageConfirmationPage.java     | 18 ++++++++++
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/delete.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/delete.vm
index a485c80007cf..e3386c002c6e 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/delete.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/delete.vm
@@ -122,11 +122,15 @@
 ##            DISPLAY CONFIRMATION PAGE
 #######################################################
 #macro(displayConfirmationPage)
-  <form id="delete" class="xform" action="$doc.getURL('delete', "$!{languageparams}")" method="post">
+  <form id="delete" action="$doc.getURL('delete', "$!{languageparams}")" method="post">
     #getChildren()
-    #displayNewTargetOption()
-    #getChildren_legacy()
-    #displayConfirmMessage()
+    ## If xform is a parent of getChildren, the ".xform field" css is also applied on the page size limit select, making it 
+    ## badly displayed.
+    <div class="xform">
+      #displayNewTargetOption()
+      #getChildren_legacy()
+      #displayConfirmMessage()
+    </div>
   </form>
 #end
 #######################################################
@@ -171,21 +175,19 @@
         ##
         ## List the documents to be deleted using a livetable
         ##
-        #set ($collist = ['doc.title', 'doc.location', 'doc.date', 'doc.author'])
-        #set ($colprops = {
-          'doc.title'    : { 'link' : 'view' },
-          'doc.location' : { 'type': 'text', 'filterable': true, 'html': true},
-          'doc.author'   : { 'link' : 'author' }
-        })
-        ## Note: we also display translations in the table since we want to show to the user all the pages that will
-        ## be deleted (including translations and hidden pages).
-        #set ($urlParameters = "xpage=getdocuments&childrenOf=$escapetool.url($doc.space)&queryFilters=unique")
-        #set ($options = { 
-          'url' : "$doc.getURL('get', $urlParameters)",
+        #set ($sourceParameters = {
           'translationPrefix' : 'platform.index.',
-          'outputOnlyHtml' : true
+          'template' : 'getdocuments.vm',
+          'childrenOf': $doc.space,
+          'queryFilters': 'unique',
+          '$doc': $doc.documentReference
+        })
+        $services.liveData.render({
+          'id': 'deleteSpaceIndex',
+          'source': 'liveTable',
+          'sourceParameters': $escapetool.url($sourceParameters),
+          'properties': 'doc.title,doc.location,doc.date,doc.author'
         })
-        #livetable('deleteSpaceIndex' $collist $colprops $options)
       #end
       #displayPanel('panel-children', 'panel-default', $heading, $body)
     #end
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/DeletePageIT.java b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/DeletePageIT.java
index 9875e97d6f3f..176b7276ff16 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/DeletePageIT.java
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/DeletePageIT.java
@@ -35,6 +35,7 @@
 import org.xwiki.flamingo.skin.test.po.JobQuestionPane;
 import org.xwiki.flamingo.skin.test.po.RestoreStatusPage;
 import org.xwiki.flamingo.skin.test.po.UndeletePage;
+import org.xwiki.livedata.test.po.LiveDataElement;
 import org.xwiki.livedata.test.po.TableLayoutElement;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.SpaceReference;
@@ -57,6 +58,7 @@
 import org.xwiki.tree.test.po.TreeElement;
 import org.xwiki.tree.test.po.TreeNodeElement;
 
+import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -273,6 +275,20 @@ void deleteChildren(TestUtils setup, TestReference parentReference, TestInfo inf
         confirmationPage = parentPage.deletePage();
         assertTrue(confirmationPage.hasAffectChildrenOption());
         confirmationPage.setAffectChildren(false);
+        confirmationPage.openAffectChildrenPanel();
+        TableLayoutElement affectChildrenLiveData = new LiveDataElement("deleteSpaceIndex").getTableLayout();
+        assertEquals(nbChildren, affectChildrenLiveData.countRows());
+        for (int i = 1; i <= nbChildren; i++) {
+            SpaceReference childSpaceReference = childrenReferences[i - 1].getLastSpaceReference();
+            affectChildrenLiveData.assertCellWithLink("Title", String.format("Child %d", i),
+                setup.getURL(childSpaceReference));
+            affectChildrenLiveData.assertCellWithLink("Location", String.format("Child_%d", i),
+                setup.getURL(childSpaceReference));
+            affectChildrenLiveData.assertRow("Date", hasItem(affectChildrenLiveData.getDatePatternMatcher()));
+            affectChildrenLiveData.assertCellWithLink("Last Author", "superadmin",
+                setup.getURL(new DocumentReference("xwiki", "XWiki", "superadmin")));
+        }
+
         DeletingPage deletingPage = confirmationPage.confirmDeletePage();
         deletingPage.waitUntilFinished();
         assertEquals(DELETE_SUCCESSFUL, deletingPage.getInfoMessage());
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/DeletePageConfirmationPage.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/DeletePageConfirmationPage.java
index 64e260932206..5d2924e12cc5 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/DeletePageConfirmationPage.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/DeletePageConfirmationPage.java
@@ -19,6 +19,8 @@
  */
 package org.xwiki.test.ui.po;
 
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
@@ -146,4 +148,20 @@ public DeletingPage confirmDeletePage()
         clickYes();
         return new DeletingPage();
     }
+
+    /**
+     * Open the Affect Children Panel.
+     *
+     * @since 16.0.0RC1
+     */
+    public void openAffectChildrenPanel()
+    {
+        WebElement panelCollapseButton =
+            getDriver().findElementWithoutWaiting(By.cssSelector(".panel-collapse-carret"));
+        panelCollapseButton.click();
+        getDriver().waitUntilCondition(input -> {
+            String[] classes = panelCollapseButton.getAttribute("class").split("\\s+");
+            return !List.of(classes).contains("collapsed");
+        });
+    }
 }

From 9bcebfd166264b1b1b6cd1a0b116ec664d8cba33 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Wed, 17 Jan 2024 09:26:30 +0100
Subject: [PATCH 010/143] XWIKI-21757: Support for Live Data description
 (#2778)

---
 .../java/org/xwiki/livedata/LiveDataMeta.java | 23 ++++++
 .../LiveDataRendererConfiguration.java        |  4 ++
 .../internal/LiveDataRendererParameters.java  | 22 ++++++
 .../LiveDataRendererConfigurationTest.java    | 72 +++++++++++++++++++
 .../macro/LiveDataMacroParameters.java        | 16 ++++-
 .../resources/ApplicationResources.properties |  3 +
 .../internal/macro/LiveDataMacroTest.java     |  3 +-
 .../tests/unit/layouts/LivedataLayout.spec.js | 55 ++++++++++++++
 .../src/main/vue/layouts/LivedataLayout.vue   | 20 +++++-
 9 files changed, 214 insertions(+), 4 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/test/java/org/xwiki/livedata/internal/LiveDataRendererConfigurationTest.java
 create mode 100644 xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/LiveDataMeta.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/LiveDataMeta.java
index 1600a7417969..a91764329852 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/LiveDataMeta.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/LiveDataMeta.java
@@ -25,6 +25,7 @@
 
 import org.xwiki.livedata.LiveDataPropertyDescriptor.DisplayerDescriptor;
 import org.xwiki.livedata.LiveDataPropertyDescriptor.FilterDescriptor;
+import org.xwiki.stability.Unstable;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -63,6 +64,8 @@ public class LiveDataMeta
 
     private LiveDataSelectionConfiguration selection;
 
+    private String description;
+
     /**
      * @return the default layout used to display the live data
      */
@@ -287,6 +290,26 @@ public void setSelection(LiveDataSelectionConfiguration selection)
         this.selection = selection;
     }
 
+    /**
+     * @return an optional textual description of the Live Data
+     * @since 16.0.0RC1
+     */
+    @Unstable
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    /**
+     * @param description an optional textual description of the Live Data
+     * @since 16.0.0RC1
+     */
+    @Unstable
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
     /**
      * Prevent {@code null} values where it's possible.
      */
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererConfiguration.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererConfiguration.java
index 86469205c5b6..3b42a0f5b89c 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererConfiguration.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererConfiguration.java
@@ -189,6 +189,10 @@ private LiveDataMeta getMeta(LiveDataRendererParameters parameters)
             .flatMap(ls -> ls.stream().findFirst().map(BaseDescriptor::getId))
             .ifPresent(meta::setDefaultLayout);
         meta.setPagination(getPagination(parameters));
+        String description = parameters.getDescription();
+        if (StringUtils.isNoneEmpty(description)) {
+            meta.setDescription(description);
+        }
         return meta;
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererParameters.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererParameters.java
index 93bf17cc48f0..51784c078063 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererParameters.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/LiveDataRendererParameters.java
@@ -52,6 +52,8 @@ public class LiveDataRendererParameters
 
     private String pageSizes;
 
+    private String description;
+
     /**
      * @return the Live Data instance id
      */
@@ -256,6 +258,24 @@ public void setPageSizes(String pageSizes)
         this.pageSizes = pageSizes;
     }
 
+    /**
+     * @return an optional textual description of the Live Data
+     * @since 16.0.0RC1
+     */
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    /**
+     * @param description an optional textual description of the Live Data
+     * @since 16.0.0RC1
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -281,6 +301,7 @@ public boolean equals(Object o)
             .append(this.layouts, that.layouts)
             .append(this.showPageSizeDropdown, that.showPageSizeDropdown)
             .append(this.pageSizes, that.pageSizes)
+            .append(this.description, that.description)
             .isEquals();
     }
 
@@ -299,6 +320,7 @@ public int hashCode()
             .append(this.layouts)
             .append(this.showPageSizeDropdown)
             .append(this.pageSizes)
+            .append(this.description)
             .toHashCode();
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/test/java/org/xwiki/livedata/internal/LiveDataRendererConfigurationTest.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/test/java/org/xwiki/livedata/internal/LiveDataRendererConfigurationTest.java
new file mode 100644
index 000000000000..530089d0e314
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/test/java/org/xwiki/livedata/internal/LiveDataRendererConfigurationTest.java
@@ -0,0 +1,72 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.livedata.internal;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.xwiki.livedata.LiveDataConfiguration;
+import org.xwiki.livedata.LiveDataConfigurationResolver;
+import org.xwiki.test.junit5.mockito.ComponentTest;
+import org.xwiki.test.junit5.mockito.InjectMockComponents;
+import org.xwiki.test.junit5.mockito.MockComponent;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test of {@link LiveDataRendererConfiguration}.
+ *
+ * @version $Id$
+ * @since 16.0.0RC1
+ */
+@ComponentTest
+class LiveDataRendererConfigurationTest
+{
+    @InjectMockComponents
+    private LiveDataRendererConfiguration configuration;
+
+    @MockComponent
+    private LiveDataConfigurationResolver<String> stringLiveDataConfigResolver;
+
+    @BeforeEach
+    void setUp() throws Exception
+    {
+        when(this.stringLiveDataConfigResolver.resolve("{}")).thenReturn(new LiveDataConfiguration());
+    }
+
+    @Test
+    void getLiveDataConfigurationDescriptionNotDefined() throws Exception
+    {
+        LiveDataConfiguration liveDataConfiguration =
+            this.configuration.getLiveDataConfiguration("{}", new LiveDataRendererParameters());
+        assertNull(liveDataConfiguration.getMeta().getDescription());
+    }
+
+    @Test
+    void getLiveDataConfigurationDescriptionIsDefined() throws Exception
+    {
+        LiveDataRendererParameters parameters = new LiveDataRendererParameters();
+        String description = "A description";
+        parameters.setDescription(description);
+        LiveDataConfiguration liveDataConfiguration = this.configuration.getLiveDataConfiguration("{}", parameters);
+        assertEquals(description, liveDataConfiguration.getMeta().getDescription());
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/java/org/xwiki/livedata/macro/LiveDataMacroParameters.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/java/org/xwiki/livedata/macro/LiveDataMacroParameters.java
index 7d4ba518450d..73c87ea21e21 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/java/org/xwiki/livedata/macro/LiveDataMacroParameters.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/java/org/xwiki/livedata/macro/LiveDataMacroParameters.java
@@ -22,10 +22,11 @@
 import org.xwiki.livedata.internal.LiveDataRendererParameters;
 import org.xwiki.livedata.internal.macro.LiveDataMacro;
 import org.xwiki.properties.annotation.PropertyDescription;
+import org.xwiki.stability.Unstable;
 
 /**
  * Parameters for {@link LiveDataMacro}.
- *
+ * 
  * @version $Id$
  * @since 12.10
  */
@@ -144,4 +145,17 @@ public void setPageSizes(String pageSizes)
     {
         super.setPageSizes(pageSizes);
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @since 16.0.0RC1
+     */
+    @Override
+    @Unstable
+    @PropertyDescription("An optional textual description of the Live Data.")
+    public void setDescription(String description)
+    {
+        super.setDescription(description);
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
index 7e5a8f25b6e0..3eba7e68b784 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources.properties
@@ -84,6 +84,9 @@ rendering.macro.liveData.parameter.showPageSizeDropdown.description=Show or hide
 rendering.macro.liveData.parameter.pageSizes.name=Page sizes
 rendering.macro.liveData.parameter.pageSizes.description=The comma-separated list of page sizes to display in the page size drop-down.
 
+rendering.macro.liveData.parameter.description.name=Description
+rendering.macro.liveData.parameter.description.description=An optional textual description of the Live Data.
+
 #
 # Translation keys for the live data widget.
 #
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/test/java/org/xwiki/livedata/internal/macro/LiveDataMacroTest.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/test/java/org/xwiki/livedata/internal/macro/LiveDataMacroTest.java
index f4b86425cb37..5a687e41ce84 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/test/java/org/xwiki/livedata/internal/macro/LiveDataMacroTest.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/test/java/org/xwiki/livedata/internal/macro/LiveDataMacroTest.java
@@ -175,7 +175,7 @@ void execute() throws Exception
         expectedConfig.append("    'pagination':{".trim());
         expectedConfig.append("      'pageSizes':[15,25,50],".trim());
         expectedConfig.append("      'showPageSizeDropdown':true".trim());
-        expectedConfig.append("    }".trim());
+        expectedConfig.append("    },'description':'A description'".trim());
         expectedConfig.append("  }".trim());
         expectedConfig.append("}");
 
@@ -194,6 +194,7 @@ void execute() throws Exception
         parameters.setLayouts("table, cards");
         parameters.setShowPageSizeDropdown(true);
         parameters.setPageSizes("15, 25, 50");
+        parameters.setDescription("A description");
 
         List<Block> blocks = this.liveDataMacro.execute(parameters, null, this.context);
         assertBlocks(expected, blocks, this.rendererFactory);
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js
new file mode 100644
index 000000000000..4f1c9adb6db4
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js
@@ -0,0 +1,55 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import {shallowMount} from '@vue/test-utils';
+import LivedataLayout from "../../../layouts/LivedataLayout";
+
+/**
+ * Initialize a shallow LivedataLayout component.
+ * 
+ * @param description the optional description of the Live Data
+ * @returns {Wrapper<Vue>} the initialized shallow wrapper
+ */
+function initWrapper(description) {
+  return shallowMount(LivedataLayout, {
+    provide: {
+      logic: {
+        data: {
+          id: 'my-layout-id',
+          meta: {
+            description
+          }
+        }
+      }
+    }
+  });
+}
+
+describe('LivedataLayout.vue', () => {
+  it('Without a description', () => {
+    const wrapper = initWrapper();
+    expect(wrapper.find('.description').exists()).toBe(false);
+  })
+
+  it('With a description', () => {
+    const description = "A description";
+    const wrapper = initWrapper(description);
+    expect(wrapper.find('.description').text()).toBe("A description");
+  })
+})
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
index e8ce19903959..412777db35d7 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
@@ -34,6 +34,9 @@
 -->
 <template>
   <div class="livedata-layout">
+    <p class="livedata-layout-description" :id="descriptionId" v-if="hasDescription">
+      {{ description }}
+    </p>
 
       <!--
         We are using the <keep-alive> tag in order to keep the layout mounted
@@ -46,6 +49,7 @@
         <component
           v-if="layoutComponent"
           :is="layoutComponent"
+          :aria-describedby="descriptionId"
         ></component>
       </keep-alive>
 
@@ -79,6 +83,15 @@ export default {
 
   computed: {
     data () { return this.logic.data; },
+    description() {
+      return this.data?.meta?.description;
+    },
+    hasDescription() {
+      return this.description && this.description !== '';
+    },
+    descriptionId() {
+      return `${this.logic.data.id}-description`;
+    }
   },
 
 
@@ -154,6 +167,9 @@ export default {
 </script>
 
 
-<style>
-
+<style scoped lang="less">
+/* Reuse the caption style for the description. */
+.livedata-layout-description {
+  &:extend(caption);
+}
 </style>

From 39bbab5a501871ac4012005eb4ffba54ada86f07 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 17 Jan 2024 09:54:42 +0100
Subject: [PATCH 011/143] XWIKI-21553: Do not override existing documents on
 user action * remove unused import

---
 .../xwiki/internal/document/DocumentOverrideListenerTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
index 37155d90d7d9..aac9a68493e0 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/org/xwiki/internal/document/DocumentOverrideListenerTest.java
@@ -34,7 +34,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
 
 /**
  * Unit tests for {@link DocumentOverrideListener}.

From f8601a8bd57e1827c0f7e11399868697213b2a66 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 17 Jan 2024 09:54:53 +0100
Subject: [PATCH 012/143] [misc] Bulletproofing

---
 .../org/xwiki/test/CustomUserUpdatedDocumentEventListener.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/main/java/org/xwiki/test/CustomUserUpdatedDocumentEventListener.java b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/main/java/org/xwiki/test/CustomUserUpdatedDocumentEventListener.java
index 81d3707380c0..b5314b2f5ab3 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/main/java/org/xwiki/test/CustomUserUpdatedDocumentEventListener.java
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/main/java/org/xwiki/test/CustomUserUpdatedDocumentEventListener.java
@@ -65,7 +65,8 @@ public void onEvent(Event event, Object source, Object data)
         UserUpdatingDocumentEvent userEvent = (UserUpdatingDocumentEvent) event;
         XWikiDocument sourceDoc = (XWikiDocument) source;
         DocumentReference expectedReference = new DocumentReference("xwiki", "XWiki", "XWikiPreferences");
-        if (StringUtils.equals(userEvent.getUserReference().getName(), "DeleteVersionTestUserCancelEvent")
+        if (userEvent.getUserReference() != null
+            && StringUtils.equals(userEvent.getUserReference().getName(), "DeleteVersionTestUserCancelEvent")
             && sourceDoc.getDocumentReference().equals(expectedReference)) {
             logger.info("Cancelling user event on purpose");
             userEvent.cancel();

From 9f73baf22e00494acd5f847dbdb912053549cbcc Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 17 Jan 2024 12:02:00 +0100
Subject: [PATCH 013/143] XWIKI-21697: Upgrade to Netty 4.1.105.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1d6c25d2ad70..5a742534d33c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <jetty.client.version>9.4.53.v20231009</jetty.client.version>
     <jetty.server.version>10.0.19</jetty.server.version>
     <jetty.version>${jetty.client.version}</jetty.version>
-    <netty.version>4.1.104.Final</netty.version>
+    <netty.version>4.1.105.Final</netty.version>
     <hibernate.version>5.6.15.Final</hibernate.version>
     <dockerJava.version>3.3.4</dockerJava.version>
     <cvssCalculator.version>1.4.2</cvssCalculator.version>

From bc22af4c14d62295a8b7e59a170e1889408ad745 Mon Sep 17 00:00:00 2001
From: Guillaume Delhumeau <guillaume.delhumeau@xwiki.com>
Date: Wed, 17 Jan 2024 13:35:32 +0100
Subject: [PATCH 014/143] [Misc] Fix bad comment in xwiki.cfg.

---
 .../src/main/resources/xwiki.cfg.vm                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
index b76fe67eb28b..1947a4a5d365 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
@@ -327,8 +327,8 @@ xwiki.superadminpassword=$xwikiCfgSuperadminPassword
 #-# is set for the exact domain name of the wiki.
 #-#
 #-# For example, suppose the cookiedomains is set to "mydomain.net". If I log in
-#-# on wiki1.xwiki.com, then the cookie will be set for the entire mydomain.net
-#-# domain, and if I visit wiki2.xwiki.com I will still be authenticated. If I log
+#-# on wiki1.mydomain.net, then the cookie will be set for the entire mydomain.net
+#-# domain, and if I visit wiki2.mydomain.net I will still be authenticated. If I log
 #-# in on wiki1.otherdomain.net, then I will only be authenticated on
 #-# wiki1.otherdomain.net, and not on wiki2.otherdomain.net.
 #-#

From 7bfae1323057a855cf084586776fe0c3d08aaf9f Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael.hamann@xwiki.com>
Date: Wed, 17 Jan 2024 16:05:04 +0100
Subject: [PATCH 015/143] Revert "XWIKI-20465: AWM short text field ~ display
 bug (#2020)"

This reverts commit b06b4c0e0be09e27fd6bbf8c8396ff36fb240b0d.
---
 .../java/com/xpn/xwiki/doc/XWikiDocument.java | 33 ++--------
 .../com/xpn/xwiki/doc/XWikiDocumentTest.java  | 66 +++++--------------
 2 files changed, 22 insertions(+), 77 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
index 881e9a008698..ae71841fcb55 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
@@ -164,6 +164,7 @@
 import org.xwiki.velocity.XWikiVelocityException;
 import org.xwiki.xar.internal.model.XarDocumentModel;
 import org.xwiki.xml.XMLUtils;
+import org.xwiki.xml.html.HTMLUtils;
 
 import com.xpn.xwiki.CoreConfiguration;
 import com.xpn.xwiki.XWiki;
@@ -218,32 +219,6 @@ public class XWikiDocument implements DocumentModelBridge, Cloneable
 
     private static final String CLOSE_HTML_MACRO = "{{/html}}";
 
-    /**
-     * A list of strings that are special in XWiki syntax or HTML. They don't contain strings that only have a
-     * special meaning at the start of a line.
-     */
-    private static final String[] SPECIAL_SYMBOLS = new String[] { "&", "<", "(%", "(((", "[[", "{", "**", "//", "--",
-        "__", "^^", ",,", "##", "image:", "attach:", "\\\\", "mailto:", "~" };
-
-    /**
-     * Pattern that matches special symbols that are special at the beginning of the line or the beginning of the
-     * string (as the string could be at the beginning of the line). As most of them also accept an arbitrary number of
-     * spaces, it is easier to match them using a regular expression. These are the starting characters of headings,
-     * lists, tables and quotes. Syntax for parameters and horizontal lines aren't included as they are already
-     * matched by the special symbols defined above.
-     */
-    private static final Pattern SPECIAL_SYMBOL_PATTERN = Pattern.compile("(\\n|^)"
-        // Syntax that allows an arbitrary number spaces at the beginning of the line.
-        + "(\\s*("
-        // Headings
-        + "="
-        // Lists - note that they need a space after the list symbol
-        + "|([*]+|[1*]+\\.|[:;])[:;]*\\s"
-        // Tables
-        + "|\\||![!=]"
-        // Quote doesn't allow spaces before the ">" symbol
-        + ")|>)");
-
     /**
      * An attachment waiting to be deleted at next document save.
      *
@@ -3898,10 +3873,10 @@ public String display(String fieldname, String type, String pref, BaseObject obj
             // We test if we're inside the rendering engine since it's also possible that this display() method is
             // called directly from a template and in this case we only want HTML as a result and not wiki syntax.
             // TODO: find a more generic way to handle html macro because this works only for XWiki 1.0 and XWiki 2.0
-            // Add the {{html}}{{/html}} only when result contains special characters from HTML or XWiki syntax since
-            // it's not needed for pure text
+            // Add the {{html}}{{/html}} only when result really contains html or { which could be part of an XWiki
+            // macro syntax since it's not needed for pure text
             if (isInRenderingEngine && !is10Syntax(wrappingSyntaxId)
-                && (StringUtils.containsAny(result, SPECIAL_SYMBOLS) || SPECIAL_SYMBOL_PATTERN.matcher(result).find()))
+                && (HTMLUtils.containsElementText(result) || result.indexOf("{") != -1))
             {
                 result.insert(0, "{{html clean=\"false\" wiki=\"false\"}}");
                 // Escape closing HTML macro syntax.
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
index 82bd01d0ae27..7f3b6adee6b8 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
@@ -35,8 +35,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mock;
 import org.mockito.stubbing.Answer;
 import org.xwiki.context.Execution;
@@ -54,7 +52,6 @@
 import org.xwiki.velocity.VelocityEngine;
 import org.xwiki.velocity.VelocityManager;
 import org.xwiki.velocity.XWikiVelocityException;
-import org.xwiki.xml.XMLUtils;
 
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
@@ -586,61 +583,34 @@ public void updateDocumentSection() throws XWikiException
     }
 
     @Test
-    void displayArea()
+    public void display()
     {
         when(this.xWiki.getCurrentContentSyntaxId(any())).thenReturn("xwiki/2.0");
 
         this.document.setSyntax(Syntax.XWIKI_2_0);
 
-        assertEquals("{{html clean=\"false\" wiki=\"false\"}}<p>area</p>{{/html}}",
-            this.document.display("area", "view", this.oldcore.getXWikiContext()));
-    }
+        assertEquals(
+            "{{html clean=\"false\" wiki=\"false\"}}<input size='30' id='Space.Page_0_string' value='string' name='Space.Page_0_string' type='text'/>{{/html}}",
+            this.document.display("string", "edit", this.oldcore.getXWikiContext()));
 
-    @Test
-    void displayEdit()
-    {
-        when(this.xWiki.getCurrentContentSyntaxId(any())).thenReturn("xwiki/2.0");
+        assertEquals("string", this.document.display("string", "view", this.oldcore.getXWikiContext()));
 
-        this.document.setSyntax(Syntax.XWIKI_2_0);
+        this.baseObject.setStringValue("string", "1 & 2");
 
-        assertEquals("{{html clean=\"false\" wiki=\"false\"}}<input size='30' id='Space.Page_0_string' "
-                + "value='string' name='Space.Page_0_string' type='text'/>{{/html}}",
-            this.document.display("string", "edit", this.oldcore.getXWikiContext()));
-    }
+        assertEquals("{{html clean=\"false\" wiki=\"false\"}}1 &#38; 2{{/html}}",
+            this.document.display("string", "view", this.oldcore.getXWikiContext()));
 
-    @ParameterizedTest
-    @CsvSource({
-        "string, false",
-        "'1 & 2', true",
-        "'1 < 2', true",
-        "'1 > 2', false",
-        "'Syntax **bold** test', true",
-        "'Heading == test ==', false",
-        "'list\n* Item', true",
-        "'> quote', true",
-        "' = heading =', true",
-        "'|= table header', true",
-        "'An image:image.png', true",
-        "'A (((group)))', true",
-        "'Just (a) text', false",
-        "'Test~Entry', true",
-    })
-    void display(String value, boolean htmlMacroExpected)
-    {
-        when(this.xWiki.getCurrentContentSyntaxId(any())).thenReturn("xwiki/2.0");
+        this.baseObject.setStringValue("string", "1 < 2");
 
-        this.document.setSyntax(Syntax.XWIKI_2_0);
-        if (!"string".equals(value)) {
-            this.baseObject.setStringValue("string", value);
-        }
-
-        if (htmlMacroExpected) {
-            String expected =
-                "{{html clean=\"false\" wiki=\"false\"}}" + XMLUtils.escapeElementText(value) + "{{/html}}";
-            assertEquals(expected, this.document.display("string", "view", this.oldcore.getXWikiContext()));
-        } else {
-            assertEquals(value, this.document.display("string", "view", this.oldcore.getXWikiContext()));
-        }
+        assertEquals("{{html clean=\"false\" wiki=\"false\"}}1 &#60; 2{{/html}}",
+            this.document.display("string", "view", this.oldcore.getXWikiContext()));
+
+        this.baseObject.setStringValue("string", "1 > 2");
+
+        assertEquals("1 > 2", this.document.display("string", "view", this.oldcore.getXWikiContext()));
+
+        assertEquals("{{html clean=\"false\" wiki=\"false\"}}<p>area</p>{{/html}}",
+            this.document.display("area", "view", this.oldcore.getXWikiContext()));
     }
 
     @Test

From 91bcc9c967ff4344960f5278bbb205b252ccbfc7 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Wed, 17 Jan 2024 16:09:52 +0100
Subject: [PATCH 016/143] XWIKI-21757: Support for Live Data description

Remove the confusing caption style on the description.
---
 .../src/main/vue/layouts/LivedataLayout.vue               | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
index 412777db35d7..01dcef9ca7ee 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue
@@ -165,11 +165,3 @@ export default {
 
 };
 </script>
-
-
-<style scoped lang="less">
-/* Reuse the caption style for the description. */
-.livedata-layout-description {
-  &:extend(caption);
-}
-</style>

From d9391db46975d12972bd3ac2160f9fceac02c1d7 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Wed, 17 Jan 2024 16:15:15 +0100
Subject: [PATCH 017/143] XWIKI-21757: Support for Live Data description

Fix broken test.
---
 .../src/main/tests/unit/layouts/LivedataLayout.spec.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js
index 4f1c9adb6db4..df75367739a4 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/layouts/LivedataLayout.spec.js
@@ -44,12 +44,12 @@ function initWrapper(description) {
 describe('LivedataLayout.vue', () => {
   it('Without a description', () => {
     const wrapper = initWrapper();
-    expect(wrapper.find('.description').exists()).toBe(false);
+    expect(wrapper.find('.livedata-layout-description').exists()).toBe(false);
   })
 
   it('With a description', () => {
     const description = "A description";
     const wrapper = initWrapper(description);
-    expect(wrapper.find('.description').text()).toBe("A description");
+    expect(wrapper.find('.livedata-layout-description').text()).toBe("A description");
   })
 })
\ No newline at end of file

From da9cfa6636f0a3ba0c576924af41d6547eb517c5 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Wed, 17 Jan 2024 16:30:45 +0100
Subject: [PATCH 018/143] [Misc] Use a Java 14 construct for switch + remove
 unnecessary escapes

---
 .../AbstractAsynchronousEventStore.java       |  5 +----
 .../store/solr/internal/SolrEventStore.java   |  6 ++----
 .../xpn/xwiki/export/html/HtmlPackager.java   |  4 ++--
 .../DefaultAsyncRendererExecutor.java         |  6 ++----
 .../store/internal/FileSystemStoreUtils.java  | 20 +++----------------
 5 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/src/main/java/org/xwiki/eventstream/internal/AbstractAsynchronousEventStore.java b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/src/main/java/org/xwiki/eventstream/internal/AbstractAsynchronousEventStore.java
index 825a3874aa53..260e6e52d969 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/src/main/java/org/xwiki/eventstream/internal/AbstractAsynchronousEventStore.java
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/src/main/java/org/xwiki/eventstream/internal/AbstractAsynchronousEventStore.java
@@ -209,15 +209,12 @@ public int getQueueSize()
         int size = 0;
         for (EventStoreTask<?, ?> task : this.queue) {
             switch (task.type) {
-                case DELETE_EVENT:
-                case DELETE_EVENT_BY_ID:
+                case DELETE_EVENT, DELETE_EVENT_BY_ID:
                     --size;
                     break;
-
                 case SAVE_EVENT:
                     ++size;
                     break;
-
                 default:
                     break;
             }
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/src/main/java/org/xwiki/eventstream/store/solr/internal/SolrEventStore.java b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/src/main/java/org/xwiki/eventstream/store/solr/internal/SolrEventStore.java
index 410a72b18a17..df5b5ee57ec8 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/src/main/java/org/xwiki/eventstream/store/solr/internal/SolrEventStore.java
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/src/main/java/org/xwiki/eventstream/store/solr/internal/SolrEventStore.java
@@ -744,13 +744,11 @@ private String serializeCompareCondition(CompareQueryCondition condition)
                 }
                 break;
 
-            case LESS:
-            case LESS_OR_EQUALS:
+            case LESS, LESS_OR_EQUALS:
                 builder.append(toFilterQueryStringRange(null, condition));
                 break;
 
-            case GREATER:
-            case GREATER_OR_EQUALS:
+            case GREATER, GREATER_OR_EQUALS:
                 builder.append(toFilterQueryStringRange(condition, null));
                 break;
 
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java
index 824e55da43e6..9c25aa95ff7a 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java
@@ -410,9 +410,9 @@ private void generateIndexPage(ZipOutputStream zos, XWikiContext context) throws
         StringBuilder builder = new StringBuilder();
         builder.append("""
             <!DOCTYPE HTML>
-            <html lang=\"en-US\">
+            <html lang="en-US">
                 <head>
-                    <meta charset=\"UTF-8\">
+                    <meta charset="UTF-8">
                     <title>Export Index</title>
                 </head>
                 <body>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/src/main/java/org/xwiki/rendering/async/internal/DefaultAsyncRendererExecutor.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/src/main/java/org/xwiki/rendering/async/internal/DefaultAsyncRendererExecutor.java
index e72c79e344e2..cf5b328e9966 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/src/main/java/org/xwiki/rendering/async/internal/DefaultAsyncRendererExecutor.java
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/src/main/java/org/xwiki/rendering/async/internal/DefaultAsyncRendererExecutor.java
@@ -397,11 +397,9 @@ private String encodeId(String value)
             boolean encode = false;
 
             switch (c) {
-                // '/' and '\' has been known to cause issues with various default server setup (Tomcat for example)
-                case '/':
-                case '\\':
+                // '/' and '\' have been known to cause issues with various default server setup (Tomcat for example)
+                case '/', '\\':
                     encode = true;
-
                     break;
 
                 default:
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/src/main/java/org/xwiki/store/internal/FileSystemStoreUtils.java b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/src/main/java/org/xwiki/store/internal/FileSystemStoreUtils.java
index cacd21fb1229..f844e097a549 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/src/main/java/org/xwiki/store/internal/FileSystemStoreUtils.java
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/src/main/java/org/xwiki/store/internal/FileSystemStoreUtils.java
@@ -53,7 +53,7 @@ private FileSystemStoreUtils()
      * </ul>
      * 
      * @param name the name to escape
-     * @param caseInsensitive true if case insensitive filesystems should be supported
+     * @param caseInsensitive true if case-insensitive filesystems should be supported
      * @return a safe version of the name
      */
     public static String encode(String name, boolean caseInsensitive)
@@ -70,19 +70,8 @@ public static String encode(String name, boolean caseInsensitive)
                 // + is used for encoding
                 // Characters reserved on Windows and Unix
                 // (https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx#naming_conventions)
-                case '%':
-                case '+':
-                case '<':
-                case '>':
-                case ':':
-                case '"':
-                case '/':
-                case '\\':
-                case '|':
-                case '?':
-                case '*':
+                case '%', '+', '<', '>', ':', '"', '/', '\\', '|', '?', '*':
                     encode = true;
-
                     break;
 
                 case ' ':
@@ -90,7 +79,6 @@ public static String encode(String name, boolean caseInsensitive)
                     if (i == 0 || i == name.length() - 1) {
                         encode = true;
                     }
-
                     break;
 
                 case '.':
@@ -99,16 +87,14 @@ public static String encode(String name, boolean caseInsensitive)
                     if (i == 0 || i == name.length() - 1) {
                         encode = true;
                     }
-
                     break;
 
                 default:
                     // Encode any non ASCII character to avoid surprises
-                    // For case insensitive filesystem encode upper case characters
+                    // For case-insensitive filesystem encode upper case characters
                     if (!CharUtils.isAscii(c) || (caseInsensitive && Character.isUpperCase(c))) {
                         encode = true;
                     }
-
                     break;
             }
 

From 2a9f8b858135b6efef90af5b799a012a47ccdb98 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 18 Jan 2024 09:16:58 +0100
Subject: [PATCH 019/143] XWIKI-21807: Error when adding two properties of the
 same name not properly displayed in class editor (#2803)

---
 .../main/java/com/xpn/xwiki/web/PropAddAction.java | 14 ++++----------
 .../it/org/xwiki/xclass/test/ui/ClassSheetIT.java  |  3 +++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PropAddAction.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PropAddAction.java
index e308fc9436f3..96a861e9b0f8 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PropAddAction.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PropAddAction.java
@@ -19,9 +19,6 @@
  */
 package com.xpn.xwiki.web;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.inject.Named;
 import javax.inject.Singleton;
 import javax.servlet.http.HttpServletResponse;
@@ -80,13 +77,10 @@ public boolean action(XWikiContext context) throws XWikiException
         BaseClass bclass = doc.getXClass();
         bclass.setName(doc.getFullName());
         if (bclass.get(propName) != null) {
-            context.put("message", "action.addClassProperty.error.alreadyExists");
-            List<String> parameters = new ArrayList<String>();
-            parameters.add(propName);
-            context.put("messageParameters", parameters);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST,
-                localizePlainOrKey("action.addClassProperty.error.alreadyExists", parameters.toArray()));
-            return true;
+            String localizedMessage =
+                localizePlainOrReturnKey("action.addClassProperty.error.alreadyExists", propName);
+            writeAjaxErrorResponse(HttpServletResponse.SC_BAD_REQUEST, localizedMessage, context);
+            return false;
         } else {
             MetaClass mclass = xwiki.getMetaclass();
             PropertyMetaClass pmclass = (PropertyMetaClass) mclass.get(propType);
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/src/test/it/org/xwiki/xclass/test/ui/ClassSheetIT.java b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/src/test/it/org/xwiki/xclass/test/ui/ClassSheetIT.java
index 167952c51018..06706b004e5b 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/src/test/it/org/xwiki/xclass/test/ui/ClassSheetIT.java
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/src/test/it/org/xwiki/xclass/test/ui/ClassSheetIT.java
@@ -92,6 +92,9 @@ void createClass(TestUtils setup, TestReference reference) throws Exception
         // Add a property.
         ClassEditPage classEditor = classSheetPage.clickDefineClassLink();
         classEditor.addProperty("color", "String").setPrettyName("Your favorite color");
+        // Test that adding a property with an existing name returns a notification error.
+        classEditor.addPropertyWithoutWaiting("color", "String");
+        classEditor.waitForNotificationErrorMessage("Property color already exists");
         classEditor.clickSaveAndView();
 
         // Add a new property.

From dee5bc74e6a6af82e1914134d82d3dca665e52c4 Mon Sep 17 00:00:00 2001
From: Sereza7 <lucas.charpentier@imt-atlantique.net>
Date: Thu, 18 Jan 2024 11:47:20 +0100
Subject: [PATCH 020/143] XWIKI-21791: The background of unread events
 displayed with "Load older notifications" is not grey anymore, but white *
 Fixed a couple comments * Added back the JS class addition removed in
 XWIKI-18880

---
 .../XWiki/Notifications/Code/Macro/NotificationsMacro.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml
index f1bdb494a992..8d11b7f8b040 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml
@@ -243,7 +243,7 @@ require(['jquery', 'XWikiAsyncNotificationsMacro', 'xwiki-events-bridge'], funct
    *
    * Deprecated: This macro relies only on REST API calls which don't allow all usecases to display notifications.
    * In particular, the macro won't benefits from the Skin Extension capabilities when displayed with it.
-   * It is strongly recommended to now use the XWikiAsyncNotificationMacro defined in the other JSX.
+   * It is strongly recommended to now use the XWikiAsyncNotificationsMacro defined in the other JSX.
    *
    * Except the first one, all the parameters are optional in the constructor. If they are not provided, the macro will
    * load them from the DOM element, where they should be present with the "data-" attributes.
@@ -289,7 +289,7 @@ require(['jquery', 'XWikiAsyncNotificationsMacro', 'xwiki-events-bridge'], funct
     self.pages = pages != undefined ? pages : self.macro.attr('data-pages');
     self.users = users != undefined ? users : self.macro.attr('data-users');
     self.tags = tags != undefined ? tags : self.macro.attr('data-tags');
-    console.warn("XWikiNotificationMacro is now deprecated. Please consider using XWikiAsyncNotificationMacro instead.");
+    console.warn("XWikiNotificationMacro is now deprecated. Please consider using XWikiAsyncNotificationsMacro instead.");
 
     /**
      * Function that load notifications.
@@ -403,6 +403,8 @@ require(['jquery', 'XWikiAsyncNotificationsMacro', 'xwiki-events-bridge'], funct
       // Enable the "read" button
       var readButton = notif.find('.notification-event-read-button');
       if (!entry.read &amp;&amp; self.displayReadStatus) {
+        // Make sure the style of the notification is in line with its status.
+        notif.addClass('notification-event-unread');
         readButton.prop('disabled', false);
         readButton.removeClass('hidden');
       }

From 69fe80c401fc1f542bda61bd2bdf1621f881e9f6 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Thu, 18 Jan 2024 12:15:28 +0100
Subject: [PATCH 021/143] XWIKI-21752: Email notifications events description
 do not display the user avatar anymore

  * Use the proper macro for displaying user in email notifications
---
 .../templates/notification/email/macros.vm       |  2 +-
 .../resources/templates/notification/macros.vm   | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
index a0643f0bd74d..224c8525fbdf 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
@@ -107,7 +107,7 @@
 #end
 
 #macro(displayNotificationDescription $event)
-  #displayCompositeEventDescription($event)
+  #displayCompositeEventDescription($event true)
 #end
 
 
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
index 51dcabf80e31..0481dbb1a52e 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
@@ -65,7 +65,7 @@
       #end
     </div>
     <div class="notification-description">
-      #displayCompositeEventDescription($compositeEvent)
+      #displayCompositeEventDescription($compositeEvent false)
       <div><small class="text-muted">$escapetool.xml($services.date.displayTimeAgo($compositeEvent.dates.get(0)))</small></div>
     </div>
   #end
@@ -241,7 +241,7 @@ $xwiki.getPlainUserName($user)##
   #displayNotificationEventSkeleton($icon, 'comment', $content, '')
 #end
 
-#macro(displayCompositeEventDescription $compositeEvent)
+#macro(displayCompositeEventDescription $compositeEvent $forEmail)
   #set ($baseTranslationPrefix = "${compositeEvent.type}")
   #set ($fallbackTranslationPrefix = "notifications.events.${compositeEvent.type}")
   #set ($fallbackTranslationSuffix = "description")
@@ -254,7 +254,11 @@ $xwiki.getPlainUserName($user)##
       "${baseTranslationPrefix}.${fallbackTranslationSuffix}",
       "${fallbackTranslationPrefix}.${fallbackTranslationSuffix}"
     ])
-    #set ($translationParameters = ["#displayNotificationEventUsers($compositeEvent.users, true, false)"])
+    #if ($forEmail)
+      #set ($translationParameters = ["#displayEmailNotificationEventUsers($compositeEvent.users, true, false)"])
+    #else
+      #set ($translationParameters = ["#displayNotificationEventUsers($compositeEvent.users, true, false)"])
+    #end
     $services.localization.render($translationKeys,$translationParameters)
   #else
   <div>
@@ -269,7 +273,11 @@ $xwiki.getPlainUserName($user)##
     $services.localization.render($translationKeys,$translationParameters)
   </div>
   <div>
-    #displayNotificationEventUsers($compositeEvent.users, true, true)
+    #if ($forEmail)
+      #displayEmailNotificationEventUsers($compositeEvent.users, true, true)
+    #else
+      #displayNotificationEventUsers($compositeEvent.users, true, true)
+    #end
   </div>
   #end
 #end
\ No newline at end of file

From bbde5d3f29ab4baf0c24b25f1a2d4a5a76bcf74e Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Thu, 18 Jan 2024 14:21:10 +0100
Subject: [PATCH 022/143] [Misc] Try using a backport bot for merged PRs

---
 .github/workflows/backport.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/backport.yml

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
new file mode 100644
index 000000000000..971e8a65022c
--- /dev/null
+++ b/.github/workflows/backport.yml
@@ -0,0 +1,26 @@
+name: Backport
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+
+jobs:
+  backport:
+    name: Backport
+    runs-on: ubuntu-latest
+    # Only react to merged PRs for security reasons.
+    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+    if: >
+      github.event.pull_request.merged
+      && (
+        github.event.action == 'closed'
+        || (
+          github.event.action == 'labeled'
+          && contains(github.event.label.name, 'backport')
+        )
+      )
+    steps:
+      - uses: tibdex/backport@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 316acab62aac8e08d21ed7b65f88aeeec97e2f15 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Thu, 18 Jan 2024 14:39:35 +0100
Subject: [PATCH 023/143] XWIKI-19815: Remove reset password / forgot username
 pages from Xwiki standard

  * Remove pages that are no longer used and where kept only for
    ensuring old URLs would still work
---
 .../main/resources/XWiki/ForgotUsername.xml   | 293 ------------------
 .../main/resources/XWiki/ResetPassword.xml    | 293 ------------------
 .../resources/XWiki/ResetPasswordComplete.xml | 293 ------------------
 3 files changed, 879 deletions(-)
 delete mode 100644 xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml
 delete mode 100644 xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml
 delete mode 100644 xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml

diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml
deleted file mode 100644
index 304803ba2733..000000000000
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<xwikidoc version="1.4" reference="XWiki.ForgotUsername" locale="">
-  <web>XWiki</web>
-  <name>ForgotUsername</name>
-  <language/>
-  <defaultLanguage/>
-  <translation>0</translation>
-  <creator>xwiki:XWiki.Admin</creator>
-  <parent>Main.WebHome</parent>
-  <author>xwiki:XWiki.Admin</author>
-  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
-  <version>1.1</version>
-  <title>$services.localization.render('xe.admin.forgotUsername.title')</title>
-  <comment/>
-  <minorEdit>false</minorEdit>
-  <syntaxId>xwiki/2.1</syntaxId>
-  <hidden>true</hidden>
-  <content>{{velocity}}
-#set ($newUrl = $services.security.authentication.getAuthenticationURL('retrieveusername', $request.parameterMap))
-#set ($discard = $services.logging.deprecate("ForgotUsername", "The page [XWiki.ForgotUsername] should not be used anymore in favor of the new 'authenticate/retrieveusername' URL."));
-#set ($discard = $response.sendRedirect($newUrl))
-{{/velocity}}</content>
-  <object>
-    <name>XWiki.ForgotUsername</name>
-    <number>0</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>5f9081d2-87b6-430e-8bb9-edc66544fc06</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ForgotUsername</name>
-    <number>1</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>54be8bc6-c81a-4149-b2b0-161b2b974857</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>xwiki:XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users/>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ForgotUsername</name>
-    <number>2</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>06daec64-228b-4da1-b7e6-b59d9624c859</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>1</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>view</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml
deleted file mode 100644
index 243841e84a4b..000000000000
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<xwikidoc version="1.4" reference="XWiki.ResetPassword" locale="">
-  <web>XWiki</web>
-  <name>ResetPassword</name>
-  <language/>
-  <defaultLanguage/>
-  <translation>0</translation>
-  <creator>xwiki:XWiki.Admin</creator>
-  <parent>Main.WebHome</parent>
-  <author>xwiki:XWiki.Admin</author>
-  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
-  <version>1.1</version>
-  <title>$services.localization.render('xe.admin.passwordReset.title')</title>
-  <comment/>
-  <minorEdit>false</minorEdit>
-  <syntaxId>xwiki/2.1</syntaxId>
-  <hidden>true</hidden>
-  <content>{{velocity}}
-#set ($newUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $request.parameterMap))
-#set ($discard = $services.logging.deprecate("ResetPassword", "The page [XWiki.ResetPassword] should not be used anymore in favor of the new 'authenticate/resetpassword' URL."));
-#set ($discard = $response.sendRedirect($newUrl))
-{{/velocity}}</content>
-  <object>
-    <name>XWiki.ResetPassword</name>
-    <number>0</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>8a0e8611-2818-4181-a8e9-1d1623ac3e77</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ResetPassword</name>
-    <number>1</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>bb00007c-00dd-4423-9b7b-b87896c947fb</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>xwiki:XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users/>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ResetPassword</name>
-    <number>2</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>06daec64-228b-4da1-b7e6-b59d9624c866</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>1</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>view</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml
deleted file mode 100644
index 0842a8c74070..000000000000
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<xwikidoc version="1.4" reference="XWiki.ResetPasswordComplete" locale="">
-  <web>XWiki</web>
-  <name>ResetPasswordComplete</name>
-  <language/>
-  <defaultLanguage/>
-  <translation>0</translation>
-  <creator>xwiki:XWiki.Admin</creator>
-  <parent>XWiki.ResetPassword</parent>
-  <author>xwiki:XWiki.Admin</author>
-  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
-  <version>1.1</version>
-  <title>$services.localization.render('xe.admin.passwordReset.step2.title')</title>
-  <comment/>
-  <minorEdit>false</minorEdit>
-  <syntaxId>xwiki/2.1</syntaxId>
-  <hidden>true</hidden>
-  <content>{{velocity}}
-#set ($newUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $request.parameterMap))
-#set ($discard = $services.logging.deprecate("The page [XWiki.ResetPasswordComplete] should not be used anymore in favor of the new 'authenticate/resetpassword' URL."));
-#set ($discard = $response.sendRedirect($newUrl))
-{{/velocity}}</content>
-  <object>
-    <name>XWiki.ResetPasswordComplete</name>
-    <number>0</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>7fd88649-d66d-442a-bcee-bc4147e410a7</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ResetPasswordComplete</name>
-    <number>1</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>e0264a66-4a10-4d7e-822e-6863e3caaa18</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>0</allow>
-    </property>
-    <property>
-      <groups>xwiki:XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>edit</levels>
-    </property>
-    <property>
-      <users/>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.ResetPasswordComplete</name>
-    <number>2</number>
-    <className>XWiki.XWikiRights</className>
-    <guid>06daec64-228b-4da1-b7e6-b59d9624c856</guid>
-    <class>
-      <name>XWiki.XWikiRights</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <allow>
-        <defaultValue>1</defaultValue>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>allow</displayType>
-        <name>allow</name>
-        <number>4</number>
-        <prettyName>Allow/Deny</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </allow>
-      <groups>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>groups</name>
-        <number>1</number>
-        <picker>1</picker>
-        <prettyName>Groups</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-      </groups>
-      <levels>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <multiSelect>1</multiSelect>
-        <name>levels</name>
-        <number>2</number>
-        <prettyName>Levels</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>3</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-      </levels>
-      <users>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>input</displayType>
-        <multiSelect>1</multiSelect>
-        <name>users</name>
-        <number>3</number>
-        <picker>1</picker>
-        <prettyName>Users</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <size>5</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-      </users>
-    </class>
-    <property>
-      <allow>1</allow>
-    </property>
-    <property>
-      <groups>XWiki.XWikiAllGroup</groups>
-    </property>
-    <property>
-      <levels>view</levels>
-    </property>
-    <property>
-      <users>XWiki.XWikiGuest</users>
-    </property>
-  </object>
-</xwikidoc>

From d8832778fec9f6ba8f4af438654f2d6420bd91c7 Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Thu, 18 Jan 2024 14:48:48 +0100
Subject: [PATCH 024/143] XWIKI-13912: Impossible to control contrast of the
 panel headers on Flamingo (#2497)

* Added the panel header text color to the ThemeSheet.xml
* Changed the name of the variable to fit other variables in the tab
* Updated color themes
* Fixed property name
* Fixed colortheme files and homogeneized property names
* Fixed codestyle
* Fixed consistency
* Fixed backward compatibility
---
 .../main/resources/flamingo/less/accordion.less |  6 +++---
 .../flamingo/less/colorThemeMappingOutput.vm    |  6 +++---
 .../main/resources/flamingo/less/panels.less    |  2 +-
 .../resources/flamingo/less/variablesInit.vm    | 11 +++++++++--
 .../main/resources/FlamingoThemes/Cerulean.xml  | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Cosmo.xml | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Cyborg.xml    | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Darkly.xml    | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Flatly.xml    | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Journal.xml   | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Lumen.xml | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Paper.xml | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Readable.xml  | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Sandstone.xml | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Simplex.xml   | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Slate.xml | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Spacelab.xml  | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Superhero.xml | 17 +++++++++++++++++
 .../main/resources/FlamingoThemes/United.xml    | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Yeti.xml  | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Charcoal.xml  | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Garden.xml    | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Iceberg.xml   | 16 ++++++++++++++++
 .../src/main/resources/FlamingoThemes/Kitty.xml | 16 ++++++++++++++++
 .../main/resources/FlamingoThemes/Marina.xml    | 16 ++++++++++++++++
 .../resources/FlamingoThemesCode/ThemeSheet.xml |  3 ++-
 .../FlamingoThemesCode/ThemeTemplate.xml        | 16 ++++++++++++++++
 27 files changed, 371 insertions(+), 10 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less
index 47ec616d3aca..aa03d5fdb0c2 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less
@@ -4,12 +4,12 @@
 
 .accordionTabTitleBar h1 {
   display:block;
-  background-color: @xwiki-panel-header-bg;
+  background-color: @panel-header-bg;
   background-image: url(@xwiki-accordion-title-bar-background);
   background-repeat: no-repeat;
   background-position: center left;
   border-bottom: 1px solid @xwiki-border-color;
-  color: @xwiki-panel-header-text;
+  color: @panel-header-text;
   font: 700 .8em / 1.8em sans-serif;
   margin: 0;
   overflow: hidden;
@@ -30,4 +30,4 @@
 .openDetails {
   cursor: pointer;
   float: right;
-}
\ No newline at end of file
+}
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm
index 3cf4683c96f8..adeeb14500b0 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm
@@ -42,8 +42,8 @@
 #mapping("menuSelectedEntryLinkColor" "@navbar-default-link-active-color")
 #mapping("panelBackgroundColor", "@panel-bg")
 #mapping("panelTextColor", "@panel-default-text")
-#mapping("panelHeaderTextColor", "@xwiki-panel-header-text")
-#mapping("panelHeaderBackgroundColor", "@xwiki-panel-header-bg")
+#mapping("panelHeaderTextColor", "@panel-header-text")
+#mapping("panelHeaderBackgroundColor", "@panel-header-bg")
 #mapping("buttonPrimaryTextColor", "@btn-primary-color")
 #mapping("buttonPrimaryBackgroundColor", "@btn-primary-bg")
 #mapping("buttonSecondaryTextColor", "@btn-default-color")
@@ -54,4 +54,4 @@
 #mapping("notificationSuccessColor", "@brand-success")
 #mapping("notificationInfoColor", "@brand-info")
 #mapping("notificationWarningColor", "@brand-warning")
-#mapping("notificationErrorColor", "@brand-danger")
\ No newline at end of file
+#mapping("notificationErrorColor", "@brand-danger")
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less
index 81c7a6e7ce39..df9a3a8ff0f4 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less
@@ -11,7 +11,7 @@ h1.xwikipaneltitle, h2.xwikipaneltitle {
   .panel-title;
   margin: @padding-small-vertical @padding-large-horizontal @padding-large-vertical;
   padding: 0 0 @padding-large-vertical;
-  color: @xwiki-panel-header-text;
+  color: @panel-header-text;
   border-bottom: @border-width solid @xwiki-page-content-bg;
   box-shadow: 0 @border-width 0 @xwiki-border-color;
   overflow: hidden;
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
index 3c4c6d829f6a..143432181c38 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
@@ -98,6 +98,9 @@
 
   @panel-bg:                            $theme.panelBackgroundColor;
   @panel-default-text:                  $theme.panelTextColor;
+  @panel-header-bg:                     $theme.panelHeaderBackgroundColor;
+  @panel-header-text:                   $theme.panelHeaderTextColor;
+  ## Kept for backward compatibility
   @xwiki-panel-header-bg:               $theme.panelHeaderBackgroundColor;
   @xwiki-panel-header-text:             $theme.panelHeaderTextColor;
 
@@ -194,6 +197,7 @@
       "legend-border-color": "color",
       "panel-bg" : "color",
       "panel-default-text" : "color",
+      "panel-header-text" : "color",
       "breadcrumb-bg": "color",
       "breadcrumb-color": "color",
       "breadcrumb-separator": "escapedText",
@@ -225,13 +229,16 @@
   ## currently, it comes from the old color theme object (see colorThemeInit.vm)
   // Default
   @xwiki-border-color:                  $theme.borderColor;
-  @xwiki-panel-header-bg:               $theme.panelHeaderBackgroundColor;
-  @xwiki-panel-header-text:             $theme.panelHeaderTextColor;
+  @panel-header-bg:                     $theme.panelHeaderBackgroundColor;
+  @panel-header-text:                   $theme.panelHeaderTextColor;
   @xwiki-page-content-bg:               $theme.pageContentBackgroundColor;
   @xwiki-background-secondary-color:    $theme.backgroundSecondaryColor;
   @xwiki-page-header-bg-color:          $theme.pageHeaderBackgroundColor;
   @xwiki-page-header-bg-image:          $stringtool.defaultString($theme.headerBackgroundImage, '""');
   @xwiki-page-header-bg-position:       $stringtool.defaultString($theme.headerBackgroundPosition, '""');
+  ## Kept for backward compatibility
+  @xwiki-panel-header-bg:               $theme.panelHeaderBackgroundColor;
+  @xwiki-panel-header-text:             $theme.panelHeaderTextColor;
 
   ## Some values are changed from the bootstrap default in order to make sure there's no accessibility contrast issue
   ## Make sure the links are dark enough in the tmDrawer
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml
index 6208958dc13a..2612abdffde0 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1941,6 +1954,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml
index b70bef84d4ef..9bc7b1032539 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2059,6 +2072,9 @@ a.list-group-item {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml
index 1f50305627ef..ec3dc9d236c1 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2050,6 +2063,9 @@ a.list-group-item {
     <property>
       <panel-bg>#060606</panel-bg>
     </property>
+    <property>
+      <panel-header-text>#ffffff</panel-header-text>
+    </property>
     <property>
       <text-color>#999999</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml
index 8113c6e9ff3d..b3fb840e65ab 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2155,6 +2168,9 @@ a.list-group-item {
     <property>
       <panel-bg>#222222</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#ffffff</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml
index 394e3472d621..53ff40d2f936 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2138,6 +2151,9 @@ a.list-group-item {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml
index 9630d842cc32..c480dda4af9b 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1944,6 +1957,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml
index 2c423cc545fd..d7da6951c32a 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2320,6 +2333,9 @@ a.list-group-item {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml
index e37bcfa27a37..dc6c9f1006f7 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2431,6 +2444,9 @@ div.main {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml
index 6377e76d434e..9bc4a35a70e4 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1997,6 +2010,9 @@ legend {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml
index 0f23fc92f551..f246329e5208 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2003,6 +2016,9 @@ input,
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml
index aaf2aa262119..46fb6fa1116c 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1973,6 +1986,9 @@ label {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml
index 595181f79987..3a38239fdc42 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2261,6 +2274,9 @@ ul.nav.nav-pills.nav-stacked li{
     <property>
       <panel-bg>#272b30</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#c8c8c8</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml
index 0eb8c5e63a98..d187f46d82f5 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1947,6 +1960,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml
index 866d5f31d927..dc8f2daa0157 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2126,6 +2139,7 @@ div.main {
 }
 
 @xwiki-panel-header-text: @navbar-default-color;
+@panel-header-text: @navbar-default-color;
 @xwiki-page-content-bg:   @body-bg;
 @text-muted: @navbar-default-color;
 </lessCode>
@@ -2163,6 +2177,9 @@ div.main {
     <property>
       <panel-bg>#2b3e50</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#ffffff</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml
index bfde2577b206..3e38ef4e7314 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1865,6 +1878,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml
index 12bbbebedf05..8ccc1ebe6316 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -2240,6 +2253,9 @@ input[type="checkbox"] {
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml
index fff89bbee77c..615aed7c4faf 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -937,6 +950,9 @@
     <property>
       <panel-bg>#F5F5F5</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#333333</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml
index 4ba971a5a934..2fb0923ad334 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -959,6 +972,9 @@ body{
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#030f02</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml
index 3458fe55b262..88d1ce6d8830 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <table-bg>
         <customDisplay/>
         <disabled>0</disabled>
@@ -1013,6 +1026,9 @@
     <property>
       <panel-bg>#fafafa</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <table-bg/>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml
index cc21f19fc00c..31134ee363b8 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -949,6 +962,9 @@
     <property>
       <panel-bg>#faf2fa</panel-bg>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#633d63</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml
index b315722d983d..eb7d3d016628 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml
@@ -753,6 +753,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -956,6 +969,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color>#091154</text-color>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
index 6aded42084cf..16ce728b0775 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
@@ -124,7 +124,8 @@
     "legend-border-color": "color"
    },
   "panels": {
-    "panel-bg" : "color"
+    "panel-bg" : "color",
+    "panel-header-text" : "color"
   },
   "breadcrumb": {
     "breadcrumb-bg": "color",
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml
index 5854e41d2c79..816006336b34 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml
@@ -744,6 +744,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </panel-bg>
+      <panel-header-text>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>panel-header-text</name>
+        <number>46</number>
+        <picker>0</picker>
+        <prettyName>panel-header-text</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </panel-header-text>
       <text-color>
         <customDisplay/>
         <disabled>0</disabled>
@@ -936,6 +949,9 @@
     <property>
       <panel-bg/>
     </property>
+    <property>
+      <panel-header-text/>
+    </property>
     <property>
       <text-color/>
     </property>

From ab206bceaac509cf80e61a543b8f7b234ba13e5a Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Thu, 18 Jan 2024 14:55:00 +0100
Subject: [PATCH 025/143] XWIKI-21775: Admin section: make the name strategy
 section pass webstandard tests (#2797)

* Fixed a `label` copy pasted too fast: the for attribute did not get updated.
* Removed the comment from the test for WYSIWYG
---
 .../resources/XWiki/EntityNameValidation/Administration.xml    | 2 +-
 .../xwiki-platform-distribution-flavor-test/pom.xml            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml
index 84c605448cd8..edf7706a8b8a 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml
@@ -72,7 +72,7 @@
           &lt;/dl&gt;
           &lt;dl&gt;
             &lt;dt&gt;
-              &lt;label for="newForbiddenCharacter"&gt;$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.label')&lt;/label&gt;
+              &lt;label for="newReplacementCharacter"&gt;$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.label')&lt;/label&gt;
               &lt;span class='xHint'&gt;$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.hint')&lt;/span&gt;
             &lt;/dt&gt;
             &lt;dd&gt;
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index f5a55a5f66c5..404df03251cd 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -287,8 +287,7 @@
                 <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=WYSIWYG
                   TODO https://jira.xwiki.org/browse/XWIKI-21773 -->
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Syntaxes
-                <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=nameStrategies
-                  TODO https://jira.xwiki.org/browse/XWIKI-21775 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=nameStrategies
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=SyntaxHighlighting
                 <!-- Mail -->
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=emailSend

From 8f1e78a14611ad087289c131f5e61b43dc900bc4 Mon Sep 17 00:00:00 2001
From: Sereza7 <lucas.charpentier@imt-atlantique.net>
Date: Wed, 17 Jan 2024 14:00:39 +0100
Subject: [PATCH 026/143] XWIKI-21777: Admin section: make the PDF export
 section pass webstandard tests * Added a missing space between attributes in
 the pdf generator select * Replaced the comment with an actual test for the
 export PDF section

---
 .../src/main/resources/XWiki/PDFExport/ConfigurationSheet.xml  | 2 +-
 .../xwiki-platform-distribution-flavor-test/pom.xml            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/ConfigurationSheet.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/ConfigurationSheet.xml
index 3c427efdd195..188c00bae480 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/ConfigurationSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/ConfigurationSheet.xml
@@ -106,7 +106,7 @@
     &lt;select id="pdfGenerator"&gt;
       #foreach ($pdfGenerator in ['userBrowser', 'chromeDockerContainer', 'remoteChrome'])
         &lt;option value="$escapetool.xml($pdfGenerator)"
-            #if ($pdfGenerator == $selectedPDFGenerator)selected="selected"#end
+            #if ($pdfGenerator == $selectedPDFGenerator)selected="selected" #end
             title="$escapetool.xml($services.localization.render("export.pdf.generator.${pdfGenerator}.hint"))"&gt;
           $escapetool.xml($services.localization.render("export.pdf.generator.${pdfGenerator}.label"))
         &lt;/option&gt;
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index 404df03251cd..7c18e7ae2986 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -274,8 +274,7 @@
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Localization
                 /xwiki/bin/import/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Import
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Export
-                <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=export.pdf
-                  TODO https://jira.xwiki.org/browse/XWIKI-21777 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=export.pdf
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Programming
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Annotations
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=XWiki.OfficeImporterAdmin

From 8211065950131ca37cf17feebd9fce067c358a55 Mon Sep 17 00:00:00 2001
From: Sereza7 <lucas.charpentier@imt-atlantique.net>
Date: Tue, 16 Jan 2024 12:32:27 +0100
Subject: [PATCH 027/143] XWIKI-21774: Admin section: make the panel wizard
 section pass webstandard tests * Replaced inline styling with regular style
 for the panel wizard tooltip * Removed the comment from the test for the
 panel wizard

---
 .../src/main/resources/Panels/PanelWizard.xml                  | 3 ++-
 .../xwiki-platform-distribution-flavor-test/pom.xml            | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/PanelWizard.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/PanelWizard.xml
index 58cb7ce6fd36..f4286dc47e02 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/PanelWizard.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/PanelWizard.xml
@@ -193,7 +193,7 @@
     #end
   #end
   #set ($panelsPerRow = 3)
-  (% id="dhtmltooltip" style="visibility: hidden;" %)((()))
+  (% id="dhtmltooltip" %)((()))
   #if ($request.place)
     #set ($ajaxurl = $xwiki.getDocument('Panels.PanelLayoutUpdate').getURL('get', "xpage=plain&amp;outputSyntax=plain&amp;place=$!{escapetool.url($request.place)}&amp;prefsdoc=${escapetool.url($currentDoc)}&amp;form_token=${escapetool.url($services.csrf.getToken())}"))
   #else
@@ -632,6 +632,7 @@
 }
 
 #dhtmltooltip {
+  display: none;
   background-color: $theme.highlightColor;
   border: 1px solid $theme.borderColor;
   padding: 2px 4px;
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index 7c18e7ae2986..f22ad55fa590 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -262,8 +262,7 @@
                 <!-- Look and feel -->
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Themes
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=menu.name
-                <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Panels.PanelWizard
-                  TODO https://jira.xwiki.org/browse/XWIKI-21774 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Panels.PanelWizard
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=panels.applications
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=panels.navigation
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Presentation

From fcb46996b8fdebc9a01063786cdca95c167ddd29 Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Thu, 18 Jan 2024 16:48:55 +0100
Subject: [PATCH 028/143] XWIKI-13967: Confusion between Supported Languages
 and Default Languages when multilingual is set to no (#2770)

* Added a CSS ruleset to remove the supported languages field from the UI when it's not useful.
---
 .../XWiki/AdminLocalizationSheet.xml          | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml
index 642395c80352..4aaa605a49dc 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml
@@ -441,4 +441,130 @@ require(['jquery', 'xwiki-l10n!xwiki-administration-localization', 'xwiki-locale
       <use>currentPage</use>
     </property>
   </object>
+  <object>
+    <name>XWiki.AdminLocalizationSheet</name>
+    <number>0</number>
+    <className>XWiki.StyleSheetExtension</className>
+    <guid>3af35852-ce5c-402a-8a09-16ee04654aac</guid>
+    <class>
+      <name>XWiki.StyleSheetExtension</name>
+      <customClass/>
+      <customMapping/>
+      <defaultViewSheet/>
+      <defaultEditSheet/>
+      <defaultWeb/>
+      <nameField/>
+      <validationScript/>
+      <cache>
+        <cache>0</cache>
+        <defaultValue>long</defaultValue>
+        <disabled>0</disabled>
+        <displayType>select</displayType>
+        <freeText>forbidden</freeText>
+        <largeStorage>0</largeStorage>
+        <multiSelect>0</multiSelect>
+        <name>cache</name>
+        <number>5</number>
+        <prettyName>Caching policy</prettyName>
+        <relationalStorage>0</relationalStorage>
+        <separator> </separator>
+        <separators>|, </separators>
+        <size>1</size>
+        <unmodifiable>0</unmodifiable>
+        <values>long|short|default|forbid</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+      </cache>
+      <code>
+        <contenttype>PureText</contenttype>
+        <disabled>0</disabled>
+        <editor>PureText</editor>
+        <name>code</name>
+        <number>2</number>
+        <prettyName>Code</prettyName>
+        <restricted>0</restricted>
+        <rows>20</rows>
+        <size>50</size>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+      </code>
+      <contentType>
+        <cache>0</cache>
+        <disabled>0</disabled>
+        <displayType>select</displayType>
+        <freeText>forbidden</freeText>
+        <largeStorage>0</largeStorage>
+        <multiSelect>0</multiSelect>
+        <name>contentType</name>
+        <number>6</number>
+        <prettyName>Content Type</prettyName>
+        <relationalStorage>0</relationalStorage>
+        <separator> </separator>
+        <separators>|, </separators>
+        <size>1</size>
+        <unmodifiable>0</unmodifiable>
+        <values>CSS|LESS</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+      </contentType>
+      <name>
+        <disabled>0</disabled>
+        <name>name</name>
+        <number>1</number>
+        <prettyName>Name</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </name>
+      <parse>
+        <disabled>0</disabled>
+        <displayFormType>select</displayFormType>
+        <displayType>yesno</displayType>
+        <name>parse</name>
+        <number>4</number>
+        <prettyName>Parse content</prettyName>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+      </parse>
+      <use>
+        <cache>0</cache>
+        <disabled>0</disabled>
+        <displayType>select</displayType>
+        <freeText>forbidden</freeText>
+        <largeStorage>0</largeStorage>
+        <multiSelect>0</multiSelect>
+        <name>use</name>
+        <number>3</number>
+        <prettyName>Use this extension</prettyName>
+        <relationalStorage>0</relationalStorage>
+        <separator> </separator>
+        <separators>|, </separators>
+        <size>1</size>
+        <unmodifiable>0</unmodifiable>
+        <values>currentPage|onDemand|always</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+      </use>
+    </class>
+    <property>
+      <cache>long</cache>
+    </property>
+    <property>
+      <code>/* Do not display the supported language field (we assume it's the following one)
+  when the multilingual option is set to No. */
+form#localization dd:has(> div.dropdown > select[name="XWiki.XWikiPreferences_0_multilingual"] > option[value="0"]:checked) + dt,
+form#localization dd:has(> div.dropdown > select[name="XWiki.XWikiPreferences_0_multilingual"] > option[value="0"]:checked) + dt + dd {
+  display: none;
+}</code>
+    </property>
+    <property>
+      <contentType/>
+    </property>
+    <property>
+      <name/>
+    </property>
+    <property>
+      <parse/>
+    </property>
+    <property>
+      <use>currentPage</use>
+    </property>
+  </object>
 </xwikidoc>

From 425af15c35c93346617eca3bfdf2e1c55d04bb2f Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Thu, 18 Jan 2024 17:17:10 +0100
Subject: [PATCH 029/143] XWIKI-21752: Email notifications events description
 do not display the user avatar anymore

  * Provide a test page for the notification email velocity template
  * Fix a bug in diff_macros.vm
  * Minor fix in NotificationRSSDefaultPageTest
---
 .../xwiki-platform-web-templates/pom.xml      |  14 +
 .../main/resources/templates/diff_macros.vm   |   8 +-
 .../web/NotificationMailDefaultHtmlTest.java  | 329 ++++++++++++++++++
 .../web/NotificationRssDefaultPageTest.java   |   2 -
 4 files changed, 347 insertions(+), 6 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java

diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
index 974eef64d12e..085480ca315b 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
@@ -170,5 +170,19 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Date script service -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-date</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- Diff script service -->
+    <dependency>
+      <groupId>org.xwiki.commons</groupId>
+      <artifactId>xwiki-commons-diff-script</artifactId>
+      <version>${commons.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
index 1e30d19761ff..affed54c19c8 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
@@ -333,14 +333,14 @@
 #macro (createDocumentDiff $oldDoc $newDoc $return)
   #set ($objectDiffs = [])
   #set ($tagsDiff = $NULL)
-  #foreach ($objectDiff in $doc.getObjectDiff($oldDoc, $newDoc))
+  #foreach ($objectDiff in $oldDoc.getObjectDiff($oldDoc, $newDoc))
     #if ($objectDiff.get(0).className == 'XWiki.TagClass')
       #set ($tagsDiff = $objectDiff)
     #else
       #set ($discard = $objectDiffs.add($objectDiff))
     #end
   #end
-  #set ($classDiff = $doc.getClassDiff($oldDoc, $newDoc))
+  #set ($classDiff = $oldDoc.getClassDiff($oldDoc, $newDoc))
   #if ($classDiff && $classDiff.size() > 0)
     #set ($classDiff = $classDiff.get(0))
   #end
@@ -353,9 +353,9 @@
     'documentReference': $documentReference,
     'oldDoc': $oldDoc,
     'newDoc': $newDoc,
-    'metaData': $doc.getMetaDataDiff($oldDoc, $newDoc),
+    'metaData': $oldDoc.getMetaDataDiff($oldDoc, $newDoc),
     'tags': $tagsDiff,
-    'attachments': $doc.getAttachmentDiff($oldDoc, $newDoc),
+    'attachments': $oldDoc.getAttachmentDiff($oldDoc, $newDoc),
     'objects': $objectDiffs,
     'classProperties': $classDiff
   })
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
new file mode 100644
index 000000000000..a0a639cee12e
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
@@ -0,0 +1,329 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.web;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import javax.script.ScriptContext;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.xwiki.diff.display.UnifiedDiffBlock;
+import org.xwiki.diff.display.UnifiedDiffElement;
+import org.xwiki.diff.script.DiffDisplayerScriptService;
+import org.xwiki.diff.script.DiffScriptService;
+import org.xwiki.eventstream.Event;
+import org.xwiki.eventstream.RecordableEventDescriptor;
+import org.xwiki.eventstream.internal.DefaultEvent;
+import org.xwiki.eventstream.script.EventStreamScriptService;
+import org.xwiki.icon.IconManagerScriptService;
+import org.xwiki.localization.script.LocalizationScriptService;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.notifications.CompositeEvent;
+import org.xwiki.platform.date.script.DateScriptService;
+import org.xwiki.rendering.syntax.Syntax;
+import org.xwiki.script.ScriptContextManager;
+import org.xwiki.script.service.ScriptService;
+import org.xwiki.template.TemplateManager;
+import org.xwiki.template.script.TemplateScriptService;
+import org.xwiki.test.annotation.ComponentList;
+import org.xwiki.test.page.HTML50ComponentList;
+import org.xwiki.test.page.PageTest;
+
+import com.xpn.xwiki.doc.XWikiDocument;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests the {@code notification/email/default.html.vm} template.
+ *
+ * @version $Id$
+ */
+@ComponentList({
+    TemplateScriptService.class
+})
+@HTML50ComponentList
+class NotificationMailDefaultHtmlTest extends PageTest
+{
+    private static final DocumentReference TEST_DOCUMENT_REFERENCE = new DocumentReference("xwiki", "Test", "WebHome");
+
+    private static final DocumentReference USER_REFERENCE = new DocumentReference("xwiki", "XWiki", "User");
+
+    private static final String MAIL_NOTIF_TEMPLATE = "notification/email/default.html.vm";
+
+    @Mock
+    private EventStreamScriptService eventStreamScriptService;
+
+    @Mock
+    private LocalizationScriptService localizationScriptService;
+
+    @Mock
+    private DateScriptService dateScriptService;
+
+    @Mock
+    private IconManagerScriptService iconManagerScriptService;
+
+    @Mock
+    private DiffScriptService diffScriptService;
+
+    @Mock
+    private DiffDisplayerScriptService diffDisplayerScriptService;
+
+    private TemplateManager templateManager;
+
+    private ScriptContext scriptContext;
+
+    @BeforeEach
+    void setUp() throws Exception
+    {
+        this.scriptContext = this.oldcore.getMocker().<ScriptContextManager>getInstance(ScriptContextManager.class)
+            .getCurrentScriptContext();
+        this.templateManager = this.oldcore.getMocker().getInstance(TemplateManager.class);
+        this.oldcore.getMocker().registerComponent(ScriptService.class, "eventstream", this.eventStreamScriptService);
+        this.oldcore.getMocker().registerComponent(ScriptService.class, "localization", this.localizationScriptService);
+        this.oldcore.getMocker().registerComponent(ScriptService.class, "date", this.dateScriptService);
+        this.oldcore.getMocker().registerComponent(ScriptService.class, "icon", this.iconManagerScriptService);
+
+        this.oldcore.getMocker().registerComponent(ScriptService.class, "diff", this.diffScriptService);
+        when(this.diffScriptService.get("display")).thenReturn(this.diffDisplayerScriptService);
+    }
+
+    @Test
+    void htmlEscaping() throws Exception
+    {
+        XWikiDocument testDocument = new XWikiDocument(TEST_DOCUMENT_REFERENCE);
+        testDocument.setTitle("Hello & Co");
+        testDocument.setSyntax(Syntax.XWIKI_2_1);
+        this.oldcore.getSpyXWiki().saveDocument(testDocument, this.context);
+        XWikiDocument clone = testDocument.clone();
+        testDocument.setContent("Content");
+        this.oldcore.getSpyXWiki().saveDocument(testDocument, this.context);
+        testDocument.setOriginalDocument(clone);
+
+        Event testEvent = new DefaultEvent();
+        testEvent.setApplication("test&app");
+        testEvent.setType("test&type");
+        // Mock date formatting to avoid issues with timezones.
+        Date testDate = new Date(12);
+        when(this.dateScriptService.displayTimeAgo(testDate)).thenReturn("A few minutes ago");
+        testEvent.setDate(testDate);
+        testEvent.setUser(USER_REFERENCE);
+        // Mock the user's name.
+        when(this.oldcore.getSpyXWiki().getPlainUserName(USER_REFERENCE, this.context)).thenReturn("First & Name");
+        testEvent.setDocument(TEST_DOCUMENT_REFERENCE);
+        testEvent.setDocumentVersion(testDocument.getVersion());
+
+        String eventType = "test&type";
+        RecordableEventDescriptor recordableEventDescriptor = mock(RecordableEventDescriptor.class);
+        when(this.eventStreamScriptService.getDescriptorForEventType(eventType, true))
+            .thenReturn(recordableEventDescriptor);
+        when(recordableEventDescriptor.getApplicationName()).thenReturn("eventType.translationKey");
+        when(this.localizationScriptService.render("eventType.translationKey")).thenReturn("Event Test&Type");
+
+        when(this.localizationScriptService.render(eq(List.of(
+            "test&type.description.by.1user",
+            "notifications.events.test&type.description.by.1user",
+            "test&type.description",
+            "notifications.events.test&type.description"
+        )), any(Collection.class))).then(invocationOnMock -> {
+            List<String> parameters = invocationOnMock.getArgument(1);
+            assertEquals(1, parameters.size());
+
+            return "User information: "+ parameters.get(0);
+        });
+        when(this.localizationScriptService.render("web.history.changes.summary.documentProperties"))
+            .thenReturn("Document properties");
+        when(this.localizationScriptService.render("web.history.changes.document.content"))
+            .thenReturn("Content");
+
+        when(this.iconManagerScriptService.renderHTML("file-text")).thenReturn("Icon file text");
+
+        String expectedDiffLink = "<a href='http://null:0/xwiki/bin/view/Test/?viewer=changes&#38;rev1=1.1&#38;"
+            + "rev2=2.1'>2.1</a>";
+        when(this.localizationScriptService.render("notifications.rss.seeChanges", List.of(expectedDiffLink)))
+            .thenReturn(String.format("See changes: [%s]", expectedDiffLink));
+
+        when(this.diffDisplayerScriptService.unified(any(String.class), any(String.class), isNull()))
+            .then(invocationOnMock -> {
+            String previous = invocationOnMock.getArgument(0);
+            assertEquals("", previous);
+
+            String next = invocationOnMock.getArgument(1);
+            assertEquals("Content", next);
+            UnifiedDiffBlock<String, Character> result = new UnifiedDiffBlock<>();
+            result.add(0, new UnifiedDiffElement<>(0, UnifiedDiffElement.Type.ADDED, "Content"));
+            return List.of(result);
+        });
+
+        this.scriptContext.setAttribute("event", new CompositeEvent(testEvent), ScriptContext.GLOBAL_SCOPE);
+
+        String result = this.templateManager.render(MAIL_NOTIF_TEMPLATE);
+        String expectedResult = "<table width=\"100%\">\n"
+            + "    <tr>\n"
+            + "                        "
+            + "<td width=\"25%\" style=\"width: 25%; vertical-align: top;\" valign=\"top\">\n"
+            + "              <strong>Event Test&#38;Type</strong>\n"
+            + "\n"
+            + "      </td>\n"
+            + "                        <td style=\"vertical-align: top;\" valign=\"top\">\n"
+            + "                  <div>\n"
+            // The hierarchy should go inside this div but it's not an easy one to mock.
+            + "    <div style=\"background-color: #f5f5f5; color: #777777; padding: 4px 8px; border-radius: 7px; "
+            + "font-size: 8px;\">\n"
+            + "      \n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "                                                                                                                                                                                                        xwiki / Hello &#38; Co / Hello &#38; Co\n"
+            + "      </div>\n"
+            + "                  <a color=\"#0088CC\" style=\"color: #0088CC; text-decoration: none;\" "
+            + "href=\"/xwiki/bin/view/Test/\">Hello &amp; Co</a>\n"
+            + "  </div>\n"
+            + "                        User information:                       "
+            + "<img src=\"cid:User.jpg\" alt=\"U\" width=\"16\" height=\"16\" style=\"vertical-align: middle;\"/>\n"
+            + "     <a color=\"#0088CC\" style=\"color: #0088CC; text-decoration: none;\" "
+            + "href=\"/xwiki/bin/view/XWiki/User\">First & Name</a>\n"
+            + "      \n"
+            + "      <div>\n"
+            + "    <small style=\"color: #777777; font-size: 0.8em;\">\n"
+            + "      A few minutes ago\n"
+            + "    </small>\n"
+            + "  </div>\n"
+            // No details as there's a single event
+            + "                              \n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "\n"
+            + "                                                                                                       "
+            + "         <div style=\"border-top: 1px dashed #e8e8e8; font-size: 0.9em;\">\n"
+            + "                        <dl class=\"diff-group\">\n"
+            + "            <dt id=\"diff-329847360\"   data-reference=\"DOCUMENT:\"\n"
+            + ">\n"
+            + "          <span class=\"diff-icon diff-icon-change\" title=\"change\">\n"
+            + "    Icon file text\n"
+            + "  </span>\n"
+            + "      Document properties\n"
+            + "    </dt>\n"
+            + "    <dd style=\"margin-left: 0\">\n"
+            + "      <dl>\n"
+            + "                                    <dt style=\"border: 1px solid #E8E8E8; "
+            + "border-left: 5px solid #E8E8E8; color: #656565; padding: .5em .2em;\" data-property-name=\"content\">\n"
+            + "    Content\n"
+            + "      </dt>\n"
+            + "            <dd style=\"margin-left: 0\">  <div style=\"border: 1px solid #E8E8E8; "
+            + "font-family: Monospace; overflow: auto;\">\n"
+            + "    <table>\n"
+            + "          <tr >\n"
+            + "        <td style=\"border-right: 1px solid #E8E8E8; color: rgba(101, 101, 101, 0.5); "
+            + "font-family: Monospace; text-align: right; vertical-align: top;\">...</td>\n"
+            + "        <td style=\"border-right: 1px solid #E8E8E8; color: rgba(101, 101, 101, 0.5); "
+            + "font-family: Monospace; text-align: right; vertical-align: top;\">...</td>\n"
+            + "                <td class=\"diff-line \" style=\"background-color: #eee; "
+            + "color: rgba(101, 101, 101, 0.5); font-family: Monospace; padding: .4em .5em;\">@@ -1,0 +1,1 @@</td>\n"
+            + "      </tr>\n"
+            + "              <tr >\n"
+            + "                    <td style=\"border-right: 1px solid #E8E8E8; color: rgba(101, 101, 101, 0.5); "
+            + "font-family: Monospace; text-align: right; vertical-align: top;\"></td>\n"
+            + "          <td style=\"border-right: 1px solid #E8E8E8; color: rgba(101, 101, 101, 0.5); "
+            + "font-family: Monospace; text-align: right; vertical-align: top;\">1</td>\n"
+            + "          <td style=\"background-color: #ccffcc;\">+Content</td>\n"
+            + "        </tr>\n"
+            + "                    </table>\n"
+            + "  </div>\n"
+            + "</dd>\n"
+            + "          </dl>\n"
+            + "    </dd>\n"
+            + "  </dl>\n"
+            + "        </div>\n"
+            + "    \n"
+            + "      </td>\n"
+            + "    </tr>\n"
+            + "  </table>";
+
+        assertEquals(expectedResult, result.trim());
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationRssDefaultPageTest.java b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationRssDefaultPageTest.java
index 375aa0063596..65cb72917b5f 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationRssDefaultPageTest.java
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationRssDefaultPageTest.java
@@ -108,8 +108,6 @@ void htmlEscaping() throws Exception
         when(this.eventStreamScriptService.getDescriptorForEventType(eventType, true))
             .thenReturn(recordableEventDescriptor);
         when(recordableEventDescriptor.getApplicationName()).thenReturn("eventType.translationKey");
-        when(this.localizationScriptService.render("eventType.translationKey")).thenReturn("RSS Event Test&Type");
-
         when(this.localizationScriptService.render("eventType.translationKey")).thenReturn("RSS Event Test&Type");
         when(this.localizationScriptService.render("notifications.events.by", Syntax.HTML_5_0, List.of("First & Name")))
             .thenReturn("Event by: [First &amp; Name]");

From e3f483a20f1beb65437d02b79452423014553f2c Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 19 Jan 2024 09:17:26 +0100
Subject: [PATCH 030/143] XWIKI-21752: Email notifications events description
 do not display the user avatar anymore

  * Fix the wrong expectation for NotificationEmailsIT tests when
    checking mail content (was containing bad code for users' avatars)
---
 .../src/test/resources/expectedHtmlMail1.txt           | 10 +++-------
 .../src/test/resources/expectedHtmlMail2.txt           | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
index b199973308a7..c10b4dd8d73d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
@@ -10,13 +10,9 @@
       </div>
       <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/NotificationsEmailTest/Page1">Title 1</a>
     </div>
-    created by
-    <span class="notification-event-user" data-xwiki-lightbox="false">
-      <img src="https://externaldomain:4242/xwiki/bin/skin/resources/icons/xwiki/noavatar.png?cache-version=\E[0-9]+\Q" alt="NotificationsEmailsITuser1"/>
-      <span class="wikilink">
-        <a href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
-      </span>
-    </span>
+    created by                       <img src="cid:NotificationsEmailsITuser1.jpg" alt="N" width="16" height="16" style="vertical-align: middle;"/>
+                                <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
+
     <div>
       <small style="color: #777777; font-size: 0.8em;">
         moments ago
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
index a585f2dc6f8b..95f013bd2d88 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
@@ -10,13 +10,9 @@
       </div>
       <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/NotificationsEmailTest/Page2">Title 2</a>
     </div>
-    created by
-    <span class="notification-event-user" data-xwiki-lightbox="false">
-      <img src="https://externaldomain:4242/xwiki/bin/skin/resources/icons/xwiki/noavatar.png?cache-version=\E[0-9]+\Q" alt="NotificationsEmailsITuser1"/>
-      <span class="wikilink">
-        <a href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
-      </span>
-    </span>
+    created by                       <img src="cid:NotificationsEmailsITuser1.jpg" alt="N" width="16" height="16" style="vertical-align: middle;"/>
+                                <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
+
     <div>
       <small style="color: #777777; font-size: 0.8em;">
         moments ago

From a1cfc2de2d5b66840ccc940ac77ac80a36cd1ea3 Mon Sep 17 00:00:00 2001
From: Sereza7 <lucas.charpentier@imt-atlantique.net>
Date: Fri, 19 Jan 2024 11:28:51 +0100
Subject: [PATCH 031/143] XWIKI-13967: Confusion between Supported Languages
 and Default Languages when multilingual is set to no * Fixed a test that
 should have been updated with the fixes for XWIKI-13967

---
 .../test/po/LocalizationAdministrationSectionPage.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java
index d66beb3e32ba..9958b05e30bc 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.xwiki.test.ui.po.BootstrapSelect;
@@ -52,7 +53,8 @@ public LocalizationAdministrationSectionPage()
         waitUntilActionButtonIsLoaded();
         // Wait for asynchronous widgets to be loaded
         getDriver().waitUntilCondition(driver -> multiLingualSelect.isDisplayed() && defaultLanguageSelect.isDisplayed()
-            && supportedLanguagesSelect.isDisplayed());
+            && (multiLingualSelect.findElement(By.xpath(".//option[@value='0']")).isSelected()
+            || supportedLanguagesSelect.isDisplayed()));
     }
 
     public void setMultiLingual(boolean isMultiLingual)

From 75d8c9566817fb44fb227ecd564759d9d5dd7f30 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Fri, 19 Jan 2024 15:45:01 +0100
Subject: [PATCH 032/143] [Misc] Defines the Live Data idProperty of the user's
 groups

Avoids warning messages in the browser console.
---
 .../src/main/resources/XWiki/XWikiUserMembershipSheet.xml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserMembershipSheet.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserMembershipSheet.xml
index 15f87d2f9a27..d01d6454d925 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserMembershipSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserMembershipSheet.xml
@@ -122,7 +122,10 @@
     'meta': {
       'propertyDescriptors': [
         { 'id': 'group', 'displayer': { 'id': 'link', 'propertyHref': 'group_url' } }
-      ]
+      ],
+      'entryDescriptor': {
+        'idProperty': "group"
+      }
     }
   })
   #set ($sourceParameters = $escapetool.url({

From 0bd5585f5b7b0045ef197d26f3c5b69a25ee42bf Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 19 Jan 2024 15:34:28 +0100
Subject: [PATCH 033/143] XWIKI-21815: Can't follow any users - Error saving
 the notification setting

  * Fix condition for watching / unwatching users
---
 .../XWiki/Notifications/Code/NotificationPreferenceService.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
index 33ae1b9764f7..f7336f1adb1d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
@@ -52,7 +52,7 @@
 #elseif ("$!request.target" == 'user')
   #set ($targetDoc = $xwiki.getDocument($targetUser))
   #set ($targetRef = $services.model.resolveDocument($targetUser))
-  #set($isActionAllowed = ($services.security.authorization.hasAccess('admin', $requestedUserDocRef) || $xcontext.userReference.equals($targetRef)))
+  #set($isActionAllowed = ("$!request.action" == 'watchUser' || "$!request.action" == 'unwatchUser' || $services.security.authorization.hasAccess('admin', $requestedUserDocRef) || $xcontext.userReference.equals($targetRef)))
 #end
 #if ("$!request.action" == "" &amp;&amp; $request.method.equalsIgnoreCase('get'))
   This is a technical page for Notifications macro.

From 9aeae7bdf5d40648ec675a40d182a1853081b837 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 19 Jan 2024 16:54:43 +0200
Subject: [PATCH 034/143] XWIKI-21558: If a macro is modified by another user
 while the macro edit modal is open, we cannot update the macro * Improve the
 way macros are updated after a remote patch is applied * Save and entry in
 the Undo/Redo history after adding a macro (in order to trigger a change
 event). * Add a test.

(cherry picked from commit 4e2ecea09ecb581a0630b32e7c3b8c0598b90695)
---
 .../src/main/webjar/xwiki-macro/plugin.js     |  21 +++-
 .../org/xwiki/ckeditor/test/po/CKEditor.java  |  10 ++
 .../test/po/CKEditorBalloonToolBar.java       |  63 +++++++++++
 .../ckeditor/test/po/CKEditorToolBar.java     |  13 ++-
 .../test/po/MacroDialogEditModal.java         |  59 +++++++++-
 .../test/ui/RealtimeWYSIWYGEditorIT.java      | 102 ++++++++++++++++++
 .../src/main/webjar/editor.js                 |  63 +++++++++--
 .../src/main/webjar/patches.js                |  39 ++++++-
 .../src/main/webjar/wysiwygEditor.js          |   1 -
 9 files changed, 348 insertions(+), 23 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorBalloonToolBar.java

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
index 0b81347d379a..b4be81a5023a 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
@@ -655,6 +655,8 @@
     },
 
     insertOrUpdateMacroWidget: function(editor, data, widget, skipRefresh) {
+      // Save the editor state before inserting the macro in order to be able to undo the macro insertion.
+      editor.fire('saveSnapshot');
       // Prevent the editor from recording Undo/Redo history entries while the edited content is being refreshed:
       // * if the macro is inserted then we need to wait for the macro markers to be replaced by the actual macro output
       // * if the macro is updated then we need to wait for the macro output to be updated to match the new macro data
@@ -706,9 +708,15 @@
             // Clean up the inline enforcer to avoid duplicates for the next inline macro insertion.
             inlineEnforcer.remove();
           }
-          editor.fire('unlockSnapshot');
+          this.waitForWidgetsToBeReady(editor).then(() => {
+            editor.fire('unlockSnapshot');
+            // Save the editor state after the macro widget is inserted and initialized in order to be able to redo the
+            // macro insertion. This also triggers the 'change' event allowing others to react to the macro insertion
+            // (e.g. the real-time editing can propagate this change).
+            editor.fire('saveSnapshot');
+          });
         }
-      });
+      }, this);
 
       if (skipRefresh) {
         return;
@@ -730,6 +738,15 @@
       editor.widgets.finalizeCreation(documentFragment);
     },
 
+    waitForWidgetsToBeReady: function(editor) {
+      const widgetsNotReady = Object.values(editor.widgets.instances).filter(widget => !widget.ready);
+      if (widgetsNotReady.length) {
+        return Promise.all(widgetsNotReady.map(widget => new Promise(resolve => widget.once('ready', resolve))));
+      } else {
+        return Promise.resolve();
+      }
+    },
+
     maybeRegisterDedicatedInsertMacroButton: function(editor, definition) {
       if (definition) {
         if (typeof definition === 'string') {
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java
index 452e04e19cd4..07812607f3ff 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java
@@ -93,6 +93,16 @@ public CKEditorToolBar getToolBar()
         return new CKEditorToolBar(this);
     }
 
+    /**
+     * @return the page object used to interact with the CKEditor balloon tool bar
+     * @since 15.10.6
+     * @since 16.0.0RC1
+     */
+    public CKEditorBalloonToolBar getBalloonToolBar()
+    {
+        return new CKEditorBalloonToolBar(this);
+    }
+
     /**
      * @return the rich text area
      */
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorBalloonToolBar.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorBalloonToolBar.java
new file mode 100644
index 000000000000..2d273563c1fa
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorBalloonToolBar.java
@@ -0,0 +1,63 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.ckeditor.test.po;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+/**
+ * Represents the CKEditor balloon tool bar that provides context actions for the selected element.
+ *
+ * @version $Id$
+ * @since 15.10.6
+ * @since 16.0.0RC1
+ */
+public class CKEditorBalloonToolBar extends CKEditorToolBar
+{
+    /**
+     * Create a new balloon tool bar instance for the given editor.
+     * 
+     * @param editor the editor that owns the balloon tool bar
+     */
+    public CKEditorBalloonToolBar(CKEditor editor)
+    {
+        super(editor);
+    }
+
+    @Override
+    protected WebElement findContainer(CKEditor editor)
+    {
+        // Look for the first displayed balloon tool bar. CKEditor keeps all the balloon tool bars in the DOM but
+        // displays at most one, depending on the selection.
+        return getDriver().findElementsWithoutWaiting(By.className("cke_balloontoolbar")).stream()
+            .filter(WebElement::isDisplayed).findFirst().orElseThrow();
+    }
+
+    /**
+     * Edit the currently focused macro.
+     * 
+     * @return the macro edit modal
+     */
+    public MacroDialogEditModal editMacro()
+    {
+        clickButton("xwiki-macro-edit");
+        return new MacroDialogEditModal().waitUntilReady();
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java
index bd88e2a9d057..39617d408dcd 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java
@@ -36,7 +36,7 @@
  */
 public class CKEditorToolBar extends BaseElement
 {
-    private final WebElement container;
+    protected final WebElement container;
 
     /**
      * Create a new tool bar instance for the given editor.
@@ -45,7 +45,12 @@ public class CKEditorToolBar extends BaseElement
      */
     public CKEditorToolBar(CKEditor editor)
     {
-        this.container = getDriver().findElementWithoutWaiting(editor.getContainer(), By.className("cke_top"));
+        this.container = findContainer(editor);
+    }
+
+    protected WebElement findContainer(CKEditor editor)
+    {
+        return getDriver().findElementWithoutWaiting(editor.getContainer(), By.className("cke_top"));
     }
 
     /**
@@ -88,12 +93,12 @@ public LinkDialog insertOrEditLink()
         return new LinkDialog();
     }
 
-    private void clickButton(String feature)
+    protected void clickButton(String feature)
     {
         getDriver().findElementWithoutWaiting(this.container, By.className("cke_button__" + feature)).click();
     }
 
-    private boolean hasButton(String feature, Predicate<WebElement> predicate)
+    protected boolean hasButton(String feature, Predicate<WebElement> predicate)
     {
         return getDriver().findElementsWithoutWaiting(this.container, By.className("cke_button__" + feature)).stream()
             .anyMatch(predicate);
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java
index b4031273dd0d..0e254c4932f8 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java
@@ -20,6 +20,7 @@
 package org.xwiki.ckeditor.test.po;
 
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
 import org.xwiki.test.ui.po.BaseElement;
 
 /**
@@ -38,18 +39,68 @@ public class MacroDialogEditModal extends BaseElement
     public MacroDialogEditModal waitUntilReady()
     {
         getDriver().waitUntilElementIsVisible(
-                // We match *-editor-modal so the page object can be used in dashboard and ckeditor tests.
-                By.cssSelector("[class*=-editor-modal] .macro-name"));
+            // We match *-editor-modal so the page object can be used both in Dashboard and CKEditor tests.
+            By.cssSelector("[class*=-editor-modal] .macro-name"));
         return this;
     }
 
+    /**
+     * Set the value of a macro parameter.
+     *
+     * @param name the macro parameter name
+     * @param value the macro parameter value
+     * @return this modal
+     * @since 15.10.6
+     * @since 16.0.0RC1
+     */
+    public MacroDialogEditModal setMacroParameter(String name, String value)
+    {
+        WebElement parameterInput = getMacroParameterInput(name);
+        parameterInput.clear();
+        parameterInput.sendKeys(value);
+        return this;
+    }
+
+    /**
+     * Retrieves the value of a macro parameter from the macro editor modal.
+     * 
+     * @param name the macro parameter name
+     * @return the value of the specified macro parameter
+     * @since 15.10.6
+     * @since 16.0.0RC1
+     */
+    public String getMacroParameter(String name)
+    {
+        return getMacroParameterInput(name).getAttribute("value");
+    }
+
+    private WebElement getMacroParameterInput(String name)
+    {
+        return getDriver().findElementWithoutWaitingWithoutScrolling(
+            // We match *-editor-modal so the page object can be used both in Dashboard and CKEditor tests.
+            By.cssSelector("[class*=-editor-modal] .macro-parameter-field input[name='" + name + "']"));
+    }
+
     /**
      * Click on the macro submission button.
      */
     public void clickSubmit()
     {
         getDriver().findElement(
-             // We match *-editor-modal so the page object can be used in dashboard and ckeditor tests.
-                By.cssSelector("[class*=-editor-modal] .modal-footer .btn-primary")).click();
+            // We match *-editor-modal so the page object can be used both in Dashboard and CKEditor tests.
+            By.cssSelector("[class*=-editor-modal] .modal-footer .btn-primary")).click();
+    }
+
+    /**
+     * Click on the Cancel button to close the macro editor modal.
+     * 
+     * @since 15.10.6
+     * @since 16.0.0RC1
+     */
+    public void clickCancel()
+    {
+        getDriver().findElement(
+            // We match *-editor-modal so the page object can be used both in Dashboard and CKEditor tests.
+            By.cssSelector("[class*=-editor-modal] .modal-footer button[data-dismiss='modal']")).click();
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index db2424fe22bf..51c5df3a7a7a 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -31,6 +31,7 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WindowType;
 import org.xwiki.ckeditor.test.po.AutocompleteDropdown;
+import org.xwiki.ckeditor.test.po.MacroDialogEditModal;
 import org.xwiki.ckeditor.test.po.image.ImageDialogEditModal;
 import org.xwiki.ckeditor.test.po.image.ImageDialogSelectModal;
 import org.xwiki.model.reference.AttachmentReference;
@@ -638,4 +639,105 @@ void imageWithCaption(TestReference testReference, TestUtils setup) throws Excep
         assertEquals("before\n\n[[Smallest **Tree**>>image:image.gif]]\n\n ",
             WikiEditPage.gotoPage(testReference).getContent());
     }
+
+    @Test
+    @Order(8)
+    void editSameMacro(TestReference testReference, TestUtils setup)
+    {
+        //
+        // First Tab
+        //
+
+        // Start fresh.
+        setup.deletePage(testReference);
+
+        RealtimeWYSIWYGEditPage firstEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor firstEditor = firstEditPage.getContenEditor();
+        RealtimeRichTextAreaElement firstTextArea = firstEditor.getRichTextArea();
+
+        firstTextArea.sendKeys("/info");
+        AutocompleteDropdown qa = new AutocompleteDropdown();
+        qa.waitForItemSelected("/info", "Info Box");
+        firstTextArea.sendKeys(Keys.ENTER);
+        qa.waitForItemSubmitted();
+
+        // The content is reloaded when a macro is inserted.
+        firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.waitUntilContentEditable();
+        // Replace the default message text.
+        firstTextArea.sendKeys(Keys.chord(Keys.SHIFT, Keys.END), Keys.BACK_SPACE);
+        firstTextArea.sendKeys("one");
+
+        MacroDialogEditModal firstMacroEditModal = firstEditor.getBalloonToolBar().editMacro();
+        firstMacroEditModal.setMacroParameter("title", "Some");
+        firstMacroEditModal.setMacroParameter("cssClass", "foo");
+
+        //
+        // Second Tab
+        //
+
+        String secondTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+        RealtimeWYSIWYGEditPage secondEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
+        RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
+
+        secondTextArea.waitUntilContentContains("one");
+        // Focus the rich text area.
+        secondTextArea.click();
+        // Move the caret inside the information box.
+        secondTextArea.sendKeys(Keys.ARROW_UP, "two ");
+
+        MacroDialogEditModal secondMacroEditModal = secondEditor.getBalloonToolBar().editMacro();
+        secondMacroEditModal.setMacroParameter("cssClass", "bar");
+
+        //
+        // First Tab
+        //
+
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstMacroEditModal.clickSubmit();
+
+        // The content is reloaded when a macro is updated.
+        firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.waitUntilContentEditable();
+
+        // Move to the information box title field and type something.
+        firstTextArea.sendKeys(Keys.chord(Keys.SHIFT, Keys.TAB));
+        firstTextArea.sendKeys(Keys.END, " title");
+
+        //
+        // Second Tab
+        //
+
+        setup.getDriver().switchTo().window(secondTabHandle);
+        secondTextArea.waitUntilContentContains("Some title");
+        secondMacroEditModal.clickSubmit();
+
+        // The content is reloaded when a macro is updated.
+        secondTextArea = secondEditor.getRichTextArea();
+        secondTextArea.waitUntilContentEditable();
+
+        // Move to the information box title field and type something.
+        secondTextArea.sendKeys(Keys.chord(Keys.SHIFT, Keys.TAB));
+        secondTextArea.sendKeys(Keys.HOME);
+        secondTextArea.sendKeys(Keys.chord(Keys.CONTROL, Keys.ARROW_RIGHT));
+        secondTextArea.sendKeys(" cool");
+
+        //
+        // First Tab
+        //
+
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstTextArea.waitUntilContentContains("Some cool title");
+
+        // Edit again the macro an verify that we have the correct parameter value.
+        firstMacroEditModal = firstEditor.getBalloonToolBar().editMacro();
+        assertEquals("bar", firstMacroEditModal.getMacroParameter("cssClass"));
+        firstMacroEditModal.clickCancel();
+
+        firstEditPage.clickSaveAndView();
+        assertEquals("{{info cssClass=\"bar\" title=\"Some cool title\"}}\ntwo one\n{{/info}}\n\n ",
+            WikiEditPage.gotoPage(testReference).getContent());
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
index c30b64b46719..8186706f2300 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
@@ -90,10 +90,13 @@ define('xwiki-realtime-wysiwyg-editor', [
 
     /**
      * Notify the editor that its content has been updated as a result of a remote change.
+     *
+     * @param {Node[]} updatedNodes the DOM nodes that have been updated (added, modified directly or with removed
+     *   descendants)
      */
-    contentUpdated() {
+    contentUpdated(updatedNodes) {
       try {
-        this._initializeWidgets();
+        this._initializeWidgets(updatedNodes);
       } catch (e) {
         console.log("Failed to (re)initialize the widgets.", e);
       }
@@ -152,16 +155,56 @@ define('xwiki-realtime-wysiwyg-editor', [
       this._CKEDITOR.plugins.xwikiSelection.restoreSelection(this._ckeditor);
     }
 
-    _initializeWidgets() {
-      const dataValues = {};
-      const widgetElements = this.getContent().querySelectorAll('[data-cke-widget-data]');
-      widgetElements.forEach((widgetElement, index) => {
-        dataValues[index] = widgetElement.getAttribute('data-cke-widget-data');
+    _initializeWidgets(updatedNodes) {
+      // Save the focused and selected widgets, as well as the widget holding the focused editable, so that we can
+      // restore them after (re)initializing the widgets (if possible).
+      const focusedWidgetWrapper = this._ckeditor.widgets.focused?.wrapper;
+      const selectedWidgetWrappers = this._ckeditor.widgets.selected.map(widget => widget.wrapper);
+      const widgetHoldingFocusedEditableWrapper = this._ckeditor.widgets.widgetHoldingFocusedEditable?.wrapper;
+
+      // Find the widgets that need to be reinitialized because some of their content was updated.
+      const updatedWidgets = new Set();
+      updatedNodes.forEach(updatedNode => {
+        if (updatedNode.nodeType === Node.ATTRIBUTE_NODE) {
+          // For attribute nodes we consider the owner element was updated.
+          updatedNode = updatedNode.ownerElement;
+        } else if (updatedNode.nodeType !== Node.ELEMENT_NODE) {
+          // The updated node is a text or comment, most probably, so it doesn't affect the widget.
+          return;
+        }
+        const updatedWidget = this._ckeditor.widgets.getByElement(new this._CKEDITOR.dom.element(updatedNode));
+        if (updatedWidget) {
+          updatedWidgets.add(updatedWidget);
+          // We also have to reinitialize the nested widgets.
+          updatedWidget.wrapper.find('.cke_widget_wrapper').toArray().forEach(nestedWidgetWrapper => {
+            const nestedWidget = this._ckeditor.widgets.getByElement(nestedWidgetWrapper, true);
+            updatedWidgets.add(nestedWidget);
+          });
+        }
       });
-      this._ckeditor.widgets.checkWidgets();
-      widgetElements.forEach((widgetElement, index) => {
-        widgetElement.setAttribute('data-cke-widget-data', dataValues[index]);
+
+      // Delete the updated widgets so that we can reinitialize them.
+      updatedWidgets.forEach(widget => {
+        delete this._ckeditor.widgets.instances[widget.id];
       });
+
+      // Remove the widgets whose element was removed from the DOM and add widgets to match the widget elements found in
+      // the DOM.
+      this._ckeditor.widgets.checkWidgets();
+
+      // Update the focused and selected widgets, as well as the widget holding the focused editable.
+      if (focusedWidgetWrapper) {
+        const focusedWidget = this._ckeditor.widgets.getByElement(focusedWidgetWrapper, true);
+        this._ckeditor.widgets.focused = focusedWidget;
+      }
+      this._ckeditor.widgets.selected = selectedWidgetWrappers.map(widgetWrapper =>
+        this._ckeditor.widgets.getByElement(widgetWrapper, true)
+      ).filter(widget => !!widget);
+      if (widgetHoldingFocusedEditableWrapper) {
+        const widgetHoldingFocusedEditable = this._ckeditor.widgets.getByElement(widgetHoldingFocusedEditableWrapper,
+          true);
+        this._ckeditor.widgets.widgetHoldingFocusedEditable = widgetHoldingFocusedEditable;
+      }
     }
 
     _onContentLoaded() {
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
index 97bbd2180794..6836180a53f2 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
@@ -46,7 +46,42 @@ define('xwiki-realtime-wysiwyg-patches', [
      */
     constructor(editor) {
       this._editor = editor;
-      this._diffDOM = new DiffDOM.DiffDOM();
+      this._diffDOM = Patches._createDiffDOM();
+    }
+
+    static _createDiffDOM() {
+      const diffDOM = new DiffDOM.DiffDOM({
+        preDiffApply: (change) => {
+          if (['replaceElement', 'removeElement', 'removeTextElement'].includes(change.diff.action)) {
+            diffDOM._updatedNodes.add(change.node.parentNode);
+          } else if (['addAttribute', 'modifyAttribute', 'removeAttribute', 'modifyTextElement', 'modifyValue',
+              'modifyComment', 'modifyChecked', 'modifySelected', 'relocateGroup'].includes(change.diff.action)) {
+            diffDOM._updatedNodes.add(change.node);
+          }
+        },
+
+        postDiffApply: (change) => {
+          if (['addTextElement', 'addElement'].includes(change.diff.action)) {
+            diffDOM._updatedNodes.add(change.newNode);
+          }
+        }
+      });
+
+      const originalApply = DiffDOM.DiffDOM.prototype.apply;
+      diffDOM.apply = function (...args) {
+        // Reset the list of updated nodes before applying a patch.
+        this._updatedNodes = new Set();
+
+        const result = originalApply.apply(this, args);
+
+        // Remove null and undefined values from the list of updated nodes.
+        this._updatedNodes.delete(null);
+        this._updatedNodes.delete(undefined);
+
+        return result;
+      };
+
+      return diffDOM;
     }
 
     /**
@@ -144,7 +179,7 @@ define('xwiki-realtime-wysiwyg-patches', [
         document: oldContent.ownerDocument
       });
 
-      this._editor.contentUpdated();
+      this._editor.contentUpdated(this._diffDOM._updatedNodes);
 
       // Restore the selection if the editor had a selection (i.e. if the selection was inside the editing area) before
       // the content update and it was affected by the content update. Note that the selection restore focuses the
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
index cc191f70bc54..99296bdc4016 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
@@ -150,7 +150,6 @@ define('xwiki-realtime-wysiwyg', [
         // Re-initialize the editable content after it is reloaded.
         initEditableContent();
         initializing = false;
-        realtimeOptions.onLocal();
         afterRefresh.forEach(item => item());
         afterRefresh = [];
       });

From 3f95f97e60db0178dffefc8239daaa824a679f1d Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Fri, 19 Jan 2024 17:11:59 +0100
Subject: [PATCH 035/143] XWIKI-21009: LiveData alternative to drag controls
 (#2809)

* Fix the lost pointer cursor on the sort caret
* Fix broken translations
* Fix the unexpected change in behavior for the resize handle
* Improve cursor on various elements to fit the features they should help use
* Make the resize handles invisible when not focused again
---
 .../src/main/vue/directives.js                |  2 -
 .../layouts/table/LayoutTableHeaderNames.vue  | 57 ++++++++++---------
 .../src/main/webjar/Logic.js                  |  3 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js
index df76cf30875e..b983c620db74 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js
@@ -50,7 +50,6 @@ export const mousedownmove = {
       const removeMousemoveHandler = () => {
         window.removeEventListener("mousemove", mousemoveHandler);
         window.removeEventListener("mouseup", removeMousemoveHandler);
-        window.removeEventListener("focusout", removeMousemoveHandler);
       };
 
       // If the "immediate" modifiers is set, dispatch the event immediately
@@ -61,7 +60,6 @@ export const mousedownmove = {
       // Bind event listeners
       window.addEventListener("mousemove", mousemoveHandler);
       window.addEventListener("mouseup", removeMousemoveHandler);
-      window.addEventListener("focusout", removeMousemoveHandler);
     });
   }
 };
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
index 8bf3921fa7cf..3835730f00ba 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTableHeaderNames.vue
@@ -61,7 +61,7 @@
       <div class="column-name">
         <!-- Property Name -->
         <button 
-          class="property-name handle"
+          class="handle"
           @click="sort(property)"
           @keydown.left="keyboardDragNDrop($event, -1)"
           @keydown.right="keyboardDragNDrop($event, 1)"
@@ -69,7 +69,7 @@
             $t('livedata.action.columnName.sortable.hint') :
             $t('livedata.action.columnName.default.hint')"
         >
-          {{ property.name }}
+          <span class="property-name">{{ property.name }}</span>
           <!--
             Sort icon
             Only show the icon for the first-level sort property
@@ -79,20 +79,19 @@
             :icon-descriptor="{name: isFirstSortLevel(property) && firstSortLevel.descending? 'caret-down': 'caret-up'}"
             :class="['sort-icon',  isFirstSortLevel(property)? 'sorted': '']"/>
         </button>
-
-        <!--
+      </div>
+      <!--
           Specify the handle to resize properties
         -->
-        <button class="resize-handle btn btn-xs btn-default" :title="$t('livedata.action.resizeColumn.hint')"
-          v-mousedownmove="mouseResizeColumnInit"
-          @mousedownmove="mouseResizeColumn"
-          @keydown.left="keyboardResizeColumn($event, -10)"
-          @keydown.right="keyboardResizeColumn($event, 10)"
-          @dblclick="resetColumnSize"
-          @keydown.esc="resetColumnSize"
-        >
-        </button>
-      </div>
+      <button class="resize-handle btn btn-xs btn-default" :title="$t('livedata.action.resizeColumn.hint')"
+              v-mousedownmove="mouseResizeColumnInit"
+              @mousedownmove="mouseResizeColumn"
+              @keydown.left="keyboardResizeColumn($event, -10)"
+              @keydown.right="keyboardResizeColumn($event, 10)"
+              @dblclick="resetColumnSize"
+              @keydown.esc="resetColumnSize"
+      >
+      </button>
     </th>
 
   </XWikiDraggable>
@@ -273,12 +272,18 @@ export default {
 }
 
 .layout-table .column-name {
-  cursor: pointer;
   display: flex;
   justify-content: space-between;
 }
 
-.layout-table .resize-handle {
+.layout-table .draggable-item .resize-handle {
+  position: absolute;
+  right: 0;
+  top: 0.5rem;
+  bottom: 0.5rem;
+  /* TODO: Discussion about the exact display of resize handles.
+      See https://jira.xwiki.org/browse/XWIKI-21816 */
+  opacity: 0;
   padding: 0;
   cursor: col-resize;
   min-width: 0;
@@ -288,8 +293,9 @@ export default {
   margin-left: 2px;
 }
 
-.layout-table .column-name:focus-within .resize-handle,
-.layout-table .column-name:hover .resize-handle {
+.layout-table .draggable-item:focus-within .resize-handle,
+.layout-table .draggable-item:hover .resize-handle {
+  opacity: 1;
   border-color: @text-muted;
   border-width: 3px;
   margin-left: 0;
@@ -299,32 +305,29 @@ export default {
   margin-right: -2px;
 }
 
-.layout-table .draggable-item:not(:last-child) .column-name:focus-within .resize-handle,
-.layout-table .draggable-item:not(:last-child) .column-name:hover .resize-handle {
+.layout-table .draggable-item:not(:last-child):focus-within .resize-handle,
+.layout-table .draggable-item:not(:last-child):hover .resize-handle {
   margin-right: -3px;
 }
 
-.layout-table .property-name {
+.layout-table .draggable-item .handle {
+  opacity: 1;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   background: transparent;
   border: 0;
-  width: 100%;
   text-align: left;
 }
 
-.draggable-item .property-name.handle  {
-  opacity: 1;
-}
-
 .layout-table .sort-icon {
   color: currentColor;
   opacity: 0;
   padding-left: @table-cell-padding;
+  cursor: pointer;
 }
 
-.layout-table .property-name .sort-icon {
+.layout-table .property-name + .sort-icon {
   vertical-align: baseline;
 }
 
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
index 552c287a5ba5..a19265005f6d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
@@ -230,7 +230,8 @@ define('xwiki-livedata', [
         "pagination.last",
         "action.refresh",
         "action.addEntry",
-        "action.reorder.hint",
+        "action.columnName.sortable.hint",
+        "action.columnName.default.hint",
         "action.resizeColumn.hint",
         "panel.filter.title",
         "panel.filter.noneFilterable",

From 1ba176298c28ef5a8926f10e864aac27cdaea793 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Mon, 22 Jan 2024 09:20:28 +0100
Subject: [PATCH 036/143] [Misc]
 DefaultTasksManagerTest.addTaskDuringTaskExecution is flickering

Prevent identical tasks to be queued at the same millisecond until XWIKI-21820 is closed.
---
 .../java/org/xwiki/index/internal/DefaultTasksManagerTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/src/test/java/org/xwiki/index/internal/DefaultTasksManagerTest.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/src/test/java/org/xwiki/index/internal/DefaultTasksManagerTest.java
index ffb20a2f151a..7b6072e8fbb1 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/src/test/java/org/xwiki/index/internal/DefaultTasksManagerTest.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/src/test/java/org/xwiki/index/internal/DefaultTasksManagerTest.java
@@ -236,6 +236,9 @@ void addTaskDuringTaskExecution() throws Exception
 
         // Block the fist task and let the next tasks execute instantly.
         doAnswer(invocation -> {
+            // TODO: Remove once XWIKI-21820 is closed, without this sleep the test might flicker if the two addTask to 
+            // doc 442 version 1.2 are executed during the same millisecond, leading to a flickering test.
+            Thread.sleep(1);
             taskDataCompletableFuture.set(this.tasksManager.addTask("wikiA", 42, "1.2", "concurrent"));
             return null;
         })

From b27c76762d6eaa24bd99ca3d4018c826af9c4665 Mon Sep 17 00:00:00 2001
From: Dorian OUAKLI <dorian.ouakli@xwiki.com>
Date: Mon, 22 Jan 2024 13:38:27 +0100
Subject: [PATCH 037/143] XWIKI-19180: In case of merge conflict choosing
 "Reload editors" won't refresh the content

XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
---
 .../src/main/resources/RTFrontend/Ajax.xml    | 131 ------
 .../main/resources/RTFrontend/ConvertHTML.xml |  64 ---
 .../realtime/ui/ConvertHTMLPageTest.java      | 118 -----
 .../src/main/webjar/saver.js                  | 437 +++---------------
 .../src/main/webjar/wikiEditor.js             |   5 +
 .../pom.xml                                   |   7 +
 .../test/ui/RealtimeWYSIWYGEditorIT.java      | 123 +++++
 .../test/po/RealtimeWYSIWYGEditPage.java      |   3 +-
 .../src/main/webjar/editor.js                 |  18 +-
 .../src/main/webjar/patches.js                |  25 +-
 .../src/main/webjar/wysiwygEditor.js          |  41 +-
 11 files changed, 231 insertions(+), 741 deletions(-)
 delete mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
 delete mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
 delete mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
deleted file mode 100644
index 72bc2d6f8d3a..000000000000
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<xwikidoc version="1.4" reference="RTFrontend.Ajax" locale="">
-  <web>RTFrontend</web>
-  <name>Ajax</name>
-  <language/>
-  <defaultLanguage/>
-  <translation>0</translation>
-  <creator>xwiki:XWiki.Admin</creator>
-  <parent>xwiki:XWiki.WebHome</parent>
-  <author>xwiki:XWiki.Admin</author>
-  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
-  <version>1.1</version>
-  <title>Realtime Ajax Merge</title>
-  <comment/>
-  <minorEdit>false</minorEdit>
-  <syntaxId>xwiki/2.1</syntaxId>
-  <hidden>true</hidden>
-  <content>{{velocity wiki=false}}
-#*
-  This script provides a serverside merge API which allows realtime sessions to peacefully coexist with simultaneous
-  non-realtime sessions. It expects the client to post its current realtime session content, the name of the relevant
-  document, and the version of its latest common ancestor (the last known savepoint).
-*#
-##
-#set ($result = {})
-#set ($result.error = false)
-#set ($CR = $util.decodeURI("%0D"))
-##
-#if ($request.version)
-  ##
-  ## the version the client expects to be its latest common ancestor
-  #set ($previousVersion = $request.get('version'))
-  ## the language of the document
-  #set ($language = $request.get('language'))
-  ## the name of the document
-  #set ($documentName = $request.get('document'))
-  ## the realtime editor's content
-  #set ($currentContent = $request.get('content'))
-  ##
-  #set ($nextDocument = $xwiki.getDocument($documentName).getTranslatedDocument($language))
-  #set ($nextContent = $nextDocument.content)
-  #set ($previousDocument = $nextDocument.getDocumentRevision($previousVersion))
-  #set ($previousContent = $previousDocument.content)
-  ##
-  ## Check if the translation in the requested language exists.
-  ## If the translation does not exist, i.e. "getTranslatedDocument" is the default document, it means it's a new translation.
-  ## In that case we have to set the contents to ""
-  #if ($language != "default" &amp;&amp; $nextDocument.locale != $language)
-    #set ($nextContent = '')
-    #set ($previousContent = '')
-  #end
-  ##
-  #if ("$!{request.convertHTML}" == '1')
-    #set ($xdom = $services.rendering.parse($currentContent, 'xhtml/1.0'))
-    #set ($currentContent = $services.rendering.render($xdom, $nextDocument.syntax.toIdString()))
-  #end
-  ##
-  #set ($result.latestVersion = $previousVersion)
-  #set ($result.currentVersion = $nextDocument.version)
-  #set ($result.previousVersionContent = $nextDocument.content) ##TODO : convert if needed
-  ##
-  ## We don't need to merge if the content has not been changed outside of the real-time session (previous == next) or
-  ## if the changes done outside of the real-time session are the same as those done within the real-time session
-  ## (current == next).
-  #if ($previousContent == $nextContent || $currentContent == $nextContent)
-    #set ($result.content = $currentContent)
-    #set ($result.merged = false)
-    #set ($result.conflicts = false)
-    #set ($result.saveRequired = $currentContent != $nextContent)
-  ## Otherwise we need to perform a 3-way merge.
-  #else
-    #set ($placeholder = " ${escapetool.getNewline()} ")
-    ##
-    #set ($previousArray = $previousContent.replace($CR, '').replace($escapetool.getNewline(), $placeholder).split(' '))
-    #set ($currentArray = $currentContent.replace($CR, '').replace($escapetool.getNewline(), $placeholder).split(' '))
-    #set ($nextArray = $nextContent.replace($CR, '').replace($escapetool.getNewline(), $placeholder).split(' '))
-    ##
-    ## $services.diff.merge() expects lists so we need to convert the arrays.
-    #set ($previousList = $previousArray.subList(0, $previousArray.size()))
-    #set ($currentList = $currentArray.subList(0, $currentArray.size()))
-    #set ($nextList = $nextArray.subList(0, $nextArray.size()))
-    #set ($mergeResult = $services.diff.merge($previousList, $nextList, $currentList, null))
-    ##
-    #set ($mergedContent = $stringtool.join($mergeResult.merged, ' ').replace($placeholder, $escapetool.getNewline()))
-    ##
-    #if ("$!{request.convertHTML}" == '1')
-      ## FIXME: This requires programming rights.
-      #set ($discard = $xcontext.setDoc($nextDocument.document))
-      #set ($source = {
-        'content': $mergedContent,
-        'syntax': $nextDocument.syntax,
-        'documentReference': $nextDocument.documentReference
-      })
-      ## FIXME: We shouldn't depend on a particular WYSIWYG editor. The code should work with the configured WYSIWYG
-      ## editor, whatever that may be.
-      #set ($mergedContent = $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent().replaceAll(
-        "([\t\r\n]|(\s{2,}))", ''))
-    #end
-    ##
-    #set ($result.content = $mergedContent)
-    #set ($result.merged = true)
-    #set ($result.conflicts = $mergeResult.log)
-    #set ($result.saveRequired = true)
-  #end
-#end
-#if ($xcontext.action == 'get')
-  #jsonResponse($result)
-#end
-{{/velocity}}</content>
-</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
deleted file mode 100644
index a9065d7cb5da..000000000000
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-
-<!--
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-
-<xwikidoc version="1.5" reference="RTFrontend.ConvertHTML" locale="">
-  <web>RTFrontend</web>
-  <name>ConvertHTML</name>
-  <language/>
-  <defaultLanguage/>
-  <translation>0</translation>
-  <creator>xwiki:XWiki.Admin</creator>
-  <parent>xwiki:XWiki.WebHome</parent>
-  <author>xwiki:XWiki.Admin</author>
-  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
-  <version>1.1</version>
-  <title>Realtime HTML Converter</title>
-  <comment/>
-  <minorEdit>false</minorEdit>
-  <syntaxId>xwiki/2.1</syntaxId>
-  <hidden>true</hidden>
-  <content>{{velocity wiki=false}}
-## TODO: We should pass directly the document reference.
-#set ($wiki = "$!request.getParameter('wiki')")
-#set ($space = "$!request.getParameter('space')")
-#set ($page = "$!request.getParameter('page')")
-#set ($documentReference = $services.model.createDocumentReference($wiki, $space, $page))
-#set ($document = $xwiki.getDocument($documentReference))
-## FIXME: This requires programming rights!
-#set ($discard = $xcontext.setDoc($document.document))
-## The $source variable is used inside the content sheet.
-#set ($source = {
-  'content': $request.text,
-  'syntax': $document.syntax,
-  'documentReference': $documentReference
-})
-#if ($xcontext.action == 'get')
-  ## Check that the CSRF token matches the user.
-  #if (!$services.csrf.isTokenValid($request.form_token))
-    $response.sendError(403, $services.localization.render('rtfFrontend.convertHtml.invalidCsrfToken'))
-  #else
-    ## FIXME: We shouldn't depend on CKEditor. This code should work independent of the configured WYSIWYG editor.
-    $xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()
-  #end
-#end
-{{/velocity}}</content>
-</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
deleted file mode 100644
index dde6b3d7cf04..000000000000
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.realtime.ui;
-
-import javax.inject.Provider;
-
-import org.jsoup.nodes.Document;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.xwiki.csrf.script.CSRFTokenScriptService;
-import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.rendering.RenderingScriptServiceComponentList;
-import org.xwiki.rendering.internal.configuration.DefaultRenderingConfigurationComponentList;
-import org.xwiki.script.service.ScriptService;
-import org.xwiki.test.page.HTML50ComponentList;
-import org.xwiki.test.page.PageTest;
-import org.xwiki.test.page.XWikiSyntax21ComponentList;
-
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.user.api.XWikiRightService;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RenderingScriptServiceComponentList
-@DefaultRenderingConfigurationComponentList
-@HTML50ComponentList
-@XWikiSyntax21ComponentList
-class ConvertHTMLPageTest extends PageTest
-{
-
-    private static final String WIKI_NAME = "xwiki";
-
-    private static final String XWIKI_SPACE = "RTFrontend";
-
-    private static final DocumentReference RTF_FRONTEND_CONVERT_HTML =
-        new DocumentReference(WIKI_NAME, XWIKI_SPACE, "ConvertHTML");
-
-    private static final String CSRF_TOKEN = "a0a0a0a0";
-
-    private CSRFTokenScriptService tokenService;
-
-    @BeforeEach
-    void setUp() throws Exception
-    {
-        // Mock the Token Service to get a consistent CSRF token throughout the tests.
-        this.tokenService = this.oldcore.getMocker().registerMockComponent(ScriptService.class, "csrf",
-            CSRFTokenScriptService.class, true);
-        when(this.tokenService.isTokenValid(CSRF_TOKEN)).thenReturn(true);
-
-        this.xwiki.initializeMandatoryDocuments(this.context);
-
-        this.context = mock(XWikiContext.class);
-        Provider<XWikiContext> xcontextProvider =
-            this.componentManager.registerMockComponent(XWikiContext.TYPE_PROVIDER);
-        when(xcontextProvider.get()).thenReturn(this.context);
-        when(this.context.getRequest()).thenReturn(this.request);
-        when(this.context.getResponse()).thenReturn(this.response);
-        when(this.context.getWiki()).thenReturn(this.xwiki);
-
-        // Fake programming access level to display the complete page.
-        XWikiRightService rightService = this.oldcore.getMockRightService();
-        when(this.xwiki.getRightService()).thenReturn(rightService);
-        when(rightService.hasProgrammingRights(this.context)).thenReturn(true);
-        this.response = spy(this.response);
-        when(this.context.getResponse()).thenReturn(this.response);
-    }
-
-    @Test
-    void checkValidCSRFToken() throws Exception
-    {
-        when(this.context.getAction()).thenReturn("get");
-        this.request.put("text", "Hello");
-        this.request.put("form_token", CSRF_TOKEN);
-        Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);
-
-        verify(this.response, never()).setStatus(anyInt());
-        verify(this.tokenService).isTokenValid(CSRF_TOKEN);
-        assertEquals("$xwiki.getDocument('CKEditor.ContentSheet').getRenderedContent()",
-            result.getElementsByTag("body").text());
-    }
-
-    @Test
-    void checkInvalidCSRFToken() throws Exception
-    {
-        String wrongToken = "wrong_token";
-        when(this.context.getAction()).thenReturn("get");
-        this.request.put("text", "Hello");
-        this.request.put("form_token", wrongToken);
-        Document result = renderHTMLPage(RTF_FRONTEND_CONVERT_HTML);
-
-        verify(this.response).sendError(403, "rtfFrontend.convertHtml.invalidCsrfToken");
-        verify(this.tokenService).isTokenValid(wrongToken);
-        assertEquals("", result.getElementsByTag("body").text());
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
index 82839c413760..4857ce619928 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
@@ -95,89 +95,6 @@ define('xwiki-realtime-saver', [
     return false;
   },
 
-  /**
-   * Retrieves attributes about the local document for the purposes of AJAX merge (just data-xwiki-document and
-   * lastSaved.version).
-   */
-  getDocumentStatistics = function() {
-    var $html = $('html'),
-      fields = [
-        'wiki',
-        'document' // includes space and page
-      ],
-      result = {};
-
-    // We can't rely on people pushing the new lastSaved.version. If they quit before ISAVED other clients won't get the
-    // new version. This isn't such an issue, because they _will_ converge eventually.
-    result.version = lastSaved.version;
-
-    fields.forEach(function (field) {
-      result[field] = $html.data('xwiki-' + field);
-    });
-
-    result.language = doc.language;
-
-    return result;
-  },
-
-  ajaxMerge = function(content, cb) {
-    // version, document
-    var stats = getDocumentStatistics();
-
-    stats.content = content;
-    if (mainConfig.isHTML) {
-      stats.convertHTML = 1;
-    }
-
-    verbose('Posting with the following stats:');
-    verbose(stats);
-
-    $.ajax({
-      url: new XWiki.Document('Ajax', 'RTFrontend').getURL('get', 'xpage=plain&outputSyntax=plain'),
-      method: 'POST',
-      dataType: 'json',
-      success: function (data) {
-        try {
-          // Data is already an "application/json".
-          var merge = data;
-          var error = merge.conflicts && merge.conflicts.length && merge.conflicts[0].formattedMessage;
-          if (error) {
-            merge.error = error;
-            cb(error, merge);
-          } else {
-            // Let the callback handle textarea writes.
-            cb(null, merge);
-          }
-        } catch (err) {
-          var debugLog = {
-            state: 'ajaxMerge/parseError',
-            lastSavedVersion: lastSaved.version,
-            lastSavedContent: lastSaved.content,
-            cUser: mainConfig.userName,
-            mergeData: data,
-            error: err
-          };
-          ErrorBox.show('parse', JSON.stringify(debugLog));
-          warn(err);
-          cb(err, data);
-        }
-      },
-      data: stats,
-      error: function (err) {
-        var debugLog = {
-          state: 'ajaxMerger/velocityError',
-          lastSavedVersion: lastSaved.version,
-          lastSavedContent: lastSaved.content,
-          cContent: content,
-          cUser: mainConfig.userName,
-          err: err
-        };
-        ErrorBox.show('velocity', JSON.stringify(debugLog));
-        warn(err);
-      },
-    });
-  },
-
   bumpVersion = function(callback, versionData) {
     var success = function(doc) {
       debug('Triggering lastSaved refresh on remote clients.');
@@ -246,22 +163,6 @@ define('xwiki-realtime-saver', [
     });
   },
 
-  presentMergeDialog = function(question, labelDefault, choiceDefault, labelAlternative, choiceAlternative) {
-    var behave = {
-      onYes: choiceDefault,
-      onNo: choiceAlternative
-    };
-
-    var param = {
-      confirmationText: question,
-      yesButtonText: labelDefault,
-      noButtonText: labelAlternative,
-      showCancelButton: true
-    };
-
-    new XWiki.widgets.ConfirmationBox(behave, param);
-  },
-
   destroyDialog = Saver.destroyDialog = function(callback) {
     var $box = $('.xdialog-box.xdialog-box-confirmation'),
       $content = $box.find('.xdialog-content');
@@ -283,154 +184,6 @@ define('xwiki-realtime-saver', [
     lastSaved.wasEditedLocally = condition;
   },
 
-  resolveMergeConflictsPromise = function(merge, deferred) {
-    // There was a merge conflict we'll need to resolve.
-    warn(merge.error);
-
-    // Halt the autosave cycle to give the user time. Don't halt forever though, because you might disconnect and hang.
-    mergeDialogCurrentlyDisplayed = true;
-
-    presentMergeDialog(
-      Messages['mergeDialog.prompt'],
-
-      Messages['mergeDialog.keepRealtime'],
-
-      function() {
-        debug('User chose to use the realtime version!');
-        // Unset the merge dialog flag.
-        mergeDialogCurrentlyDisplayed = false;
-        deferred.resolve();
-      },
-
-      Messages['mergeDialog.keepRemote'],
-
-      function() {
-        debug('User chose to use the remote version!');
-        // Unset the merge dialog flag.
-        mergeDialogCurrentlyDisplayed = false;
-        var restURL = XWiki.currentDocument.getRestURL();
-        if (doc.language && !/\/pages\/(.+)\/translations\//.test(restURL)) {
-          restURL = restURL + doc.language;
-        }
-
-        $.getJSON(restURL).then(data => {
-          mainConfig.setTextValue(data.content, true, function() {
-            debug("Overwrote the realtime session's content with the latest saved state.");
-            bumpVersion(function() {
-              lastSaved.mergeMessage('mergeOverwrite', []);
-            });
-            deferred.resolve();
-          });
-        }).catch(error => {
-          mainConfig.safeCrash('keepremote');
-          warn("Encountered an error while fetching remote content.");
-          warn(error);
-          deferred.reject();
-        });
-      }
-    );
-  },
-
-  resolveMergeConflicts = function(merge) {
-    return new Promise((resolve, reject) => resolveMergeConflictsPromise(merge, {resolve, reject}));
-  },
-
-  mergedWithoutConflicts = function(merge, preMergeContent) {
-    return new Promise((resolve, reject) => {
-      // The content was merged and there were no errors / conflicts.
-      if (preMergeContent !== mainConfig.getTextValue()) {
-        // There have been changes since merging. Don't overwrite if there have been changes while merging
-        // See http://jira.xwiki.org/browse/RTWIKI-37
-        // Try again in one cycle.
-        reject();
-      } else {
-        // Walk the tree of hashes and if merge.previousVersionContent exists, then this merge is quite possibly faulty.
-        if (mainConfig.realtime.getDepthOfState(merge.previousVersionContent) !== -1) {
-          debug("The server merged a version which already existed in the history. " +
-            "Reversions shouldn't merge. Ignoring merge.");
-          debug("waseverstate=true");
-          resolve();
-        } else {
-          debug("The latest version content does not exist anywhere in our history.");
-          debug("Continuing...");
-          // There were no errors or local changes. Push to the textarea.
-          mainConfig.setTextValue(merge.content, false, resolve);
-        }
-      }
-    });
-  },
-
-  // callback takes signature (error, shouldSave)
-  mergeContinuation = function(merge, callback) {
-    // Our continuation has three cases:
-    if (isaveInterrupt()) {
-      // 1. ISAVE interrupt error
-      callback('ISAVED interrupt', null);
-    } else if (merge.saveRequired) {
-      // 2. saveRequired
-      callback(null, true);
-    } else {
-      // 3. saveNotRequired
-      callback(null, false);
-    }
-  },
-
-  mergeCallback = function(preMergeContent, andThen, error, merge) {
-    if (error) {
-      if (!merge || typeof merge === 'undefined') {
-        warn('The ajax merge API did not return an object. Something went wrong');
-        warn(error);
-        return;
-      } else if (error === merge.error) {
-        // There was a merge error. Continue and handle elsewhere.
-        warn(error);
-      } else {
-        // It was some other kind of error... parsing? Complain and return. This means the script failed.
-        warn(error);
-        return;
-      }
-    }
-
-    if (isaveInterrupt()) {
-      andThen('ISAVED interrupt', null);
-
-    } else if (merge.content === lastSaved.content) {
-      // Don't dead end, but indicate that you shouldn't save.
-      andThen("Merging didn't result in a change.", false);
-      setLocalEditFlag(false);
-
-    // http://jira.xwiki.org/browse/RTWIKI-34
-    // Give Messages when merging.
-    } else if (merge.merged) {
-      // TODO update version field with merge.currentVersion
-      console.log("Force updating version to: " + merge.currentVersion);
-      if (xwikiMeta.setVersion) {
-        xwikiMeta.setVersion(merge.currentVersion);
-      }
-      // A merge took place.
-      if (merge.error) {
-        resolveMergeConflicts(merge).then(mergeContinuation.bind(null, merge, andThen));
-      } else {
-        mergedWithoutConflicts(merge, preMergeContent).then(() => {
-          mergeContinuation(merge, andThen);
-        }).catch(() => {
-          andThen("The realtime content changed while we were performing our asynchronous merge.", false);
-        });
-      }
-
-    } else {
-      // No merge was necessary, but you might still have to save.
-      mergeContinuation(merge, andThen);
-    }
-  },
-
-  mergeRoutine = function(andThen) {
-    // Post your current version to the server to see if it must merge. Remember the current state so you can check if
-    // it has changed.
-    var preMergeContent = mainConfig.getTextValue();
-    ajaxMerge(preMergeContent, mergeCallback.bind(null, preMergeContent, andThen));
-  },
-
   onMessage = function(data) {
     // Set a flag so any concurrent processes know to abort.
     lastSaved.receivedISAVE = true;
@@ -524,7 +277,7 @@ define('xwiki-realtime-saver', [
     rtData = data;
 
     return false;
-  },
+  };
 
   /**
    * This contains some of the more complicated logic in this script. Clients check for remote changes on random
@@ -535,7 +288,6 @@ define('xwiki-realtime-saver', [
    * their local state to match. During this process, a series of checks are made to reduce the number of unnecessary
    * saves, as well as the number of unnecessary merges.
    */
-  mergeDialogCurrentlyDisplayed = false;
   Saver.create = function(config) {
     $.extend(mainConfig, config);
     mainConfig.formId = mainConfig.formId || 'edit';
@@ -545,91 +297,6 @@ define('xwiki-realtime-saver', [
     lastSaved.time = now();
 
     var onOpen = function(chan) {
-      // Originally implemented as part of 'saveRoutine', abstracted logic such that the merge/save algorithm can
-      // terminate with different callbacks for different use cases.
-      var saveFinalizer = function(e, shouldSave) {
-        var toSave = mainConfig.getTextValue();
-        if (toSave === null) {
-          e = "Unable to get the content of the document. Don't save.";
-        }
-        if (e) {
-          warn(e);
-        } else if (shouldSave) {
-          saveDocument(mainConfig.getSaveValue()).then(doc => {
-            // Cache this because bumpVersion will increment it.
-            var lastVersion = lastSaved.version;
-
-            // Update values in lastSaved.
-            updateLastSaved(toSave);
-
-            // Get document version.
-            bumpVersion(function(doc) {
-              if (doc.version === '1.1') {
-                debug('Created document version 1.1');
-              } else {
-                debug(`Version bumped from ${lastVersion} to ${doc.version}.`);
-              }
-              lastSaved.mergeMessage('saved', [doc.version]);
-            }, doc);
-          });
-        } else {
-          // local content matches that of the latest version
-          verbose("No save was necessary");
-          lastSaved.content = toSave;
-          // didn't save, don't need a callback
-          bumpVersion();
-        }
-      };
-
-      function saveRoutine(andThen, force) {
-        // If this is ever true in your save routine, complain and abort.
-        lastSaved.receivedISAVE = false;
-
-        const toSave = mainConfig.getTextValue();
-        if (toSave === null) {
-          warn("Unable to get the content of the document. Don't save.");
-          return;
-        }
-
-        if (lastSaved.content === toSave && !force ) {
-          verbose("No changes made since last save. Avoiding unnecessary commits.");
-          return;
-        }
-
-        if (mainConfig.mergeContent) {
-          mergeRoutine(andThen);
-        } else {
-          andThen(null, true);
-        }
-      }
-
-      let preventDefaultSave = true;
-      function saveButtonAction(continueEditing) {
-        debug("Saver.create.saveand" + (continueEditing ? 'continue' : 'view'));
-
-        saveRoutine(function(e) {
-          if (e) {
-            warn(e);
-          }
-
-          lastSaved.shouldRedirect = !continueEditing;
-          preventDefaultSave = false;
-          // We use the Save & Continue button to trigger the save because we want to perform some action after the
-          // content is saved and we handle the redirect to view mode ourselves.
-          $(`#${config.formId} [name="action_saveandcontinue"]`).click();
-        }, /* force: */ true);
-      }
-
-      // Special handling of save action.
-      $(document).off('xwiki:actions:beforeSave.realtime-saver')
-        .on('xwiki:actions:beforeSave.realtime-saver', function(event) {
-          if (preventDefaultSave) {
-            event.preventDefault();
-            saveButtonAction($(event.target).attr('name') === 'action_saveandcontinue');
-          }
-          // Reset the flag for the next save.
-          preventDefaultSave = true;
-        });
 
       // There's a very small chance that the preview button might cause problems, so let's just get rid of it.
       $('[name="action_preview"]').remove();
@@ -643,33 +310,28 @@ define('xwiki-realtime-saver', [
         updateLastSaved(toSave);
 
         doc.reload().then(doc => {
-          if (doc.isNew) {
-            // It didn't actually save?
-            ErrorBox.show('save');
-          } else {
-            lastSaved.onReceiveOwnIsave = function() {
-              // Once you get your isaved back, redirect.
-              debug("lastSaved.shouldRedirect " + lastSaved.shouldRedirect);
-              if (lastSaved.shouldRedirect) {
-                debug('Saver.create.saveandview.receivedOwnIsaved');
-                debug("redirecting!");
-                redirectToView();
-              } else {
-                debug('Saver.create.saveandcontinue.receivedOwnIsaved');
-              }
-              // Clean up after yourself..
-              lastSaved.onReceiveOwnIsave = null;
-            };
-            // Bump the version, fire your isaved.
-            bumpVersion(function(doc) {
-              if (doc.version === '1.1') {
-                debug('Created document version 1.1');
-              } else {
-                debug(`Version bumped from ${lastVersion} to ${doc.version}.`);
-              }
-              lastSaved.mergeMessage('saved', [doc.version]);
-            }, doc);
-          }
+          lastSaved.onReceiveOwnIsave = function() {
+            // Once you get your isaved back, redirect.
+            debug("lastSaved.shouldRedirect " + lastSaved.shouldRedirect);
+            if (lastSaved.shouldRedirect) {
+              debug('Saver.create.saveandview.receivedOwnIsaved');
+              debug("redirecting!");
+              redirectToView();
+            } else {
+              debug('Saver.create.saveandcontinue.receivedOwnIsaved');
+            }
+            // Clean up after yourself..
+            lastSaved.onReceiveOwnIsave = null;
+          };
+          // Bump the version, fire your isaved.
+          bumpVersion(function(doc) {
+            if (doc.version === '1.1') {
+              debug('Created document version 1.1');
+            } else {
+              debug(`Version bumped from ${lastVersion} to ${doc.version}.`);
+            }
+            lastSaved.mergeMessage('saved', [doc.version]);
+          }, doc);
         }).catch(error => {
           warn(error);
           ErrorBox.show('save');
@@ -695,37 +357,52 @@ define('xwiki-realtime-saver', [
          console.log(ev);
         }
       };
-      // FIXME: Find a way to remove the old listener without using Prototype.js API.
-      document.stopObserving('xwiki:document:saveFailed');
-      $(document).on('xwiki:document:saveFailed.realtime-saver', onSaveFailedHandler);
 
       // TimeOut
       var check = function() {
+        lastSaved.receivedISAVE = false;
+
+        const toSave = mainConfig.getTextValue();
+        if (toSave === null) {
+          warn("Unable to get the content of the document. Don't save.");
+          return;
+        }
+
+        if (lastSaved.content === toSave) {
+          verbose("No changes made since last save. Avoiding unnecessary commits.");
+          return;
+        }
+
         clearTimeout(mainConfig.autosaveTimeout);
         verbose("Saver.create.check");
         var periodDuration = Math.random() * SAVE_DOC_CHECK_CYCLE;
         mainConfig.autosaveTimeout = setTimeout(check, periodDuration);
 
         verbose(`Will attempt to save again in ${periodDuration} ms.`);
-
-        if (!lastSaved.wasEditedLocally) {
-          verbose("Skipping save routine because no changes have been made locally");
+        if (!lastSaved.wasEditedLocally || now() - lastSaved.time < SAVE_DOC_TIME) {
+          verbose("!lastSaved.wasEditedLocally || (Now - lastSaved.time) < SAVE_DOC_TIME");
           return;
-        } else {
-          verbose("There have been local changes!");
         }
-        if (now() - lastSaved.time < SAVE_DOC_TIME) {
-          verbose("(Now - lastSaved.time) < SAVE_DOC_TIME");
-          return;
-        }
-        // Avoid queuing up multiple merge dialogs.
-        if (mergeDialogCurrentlyDisplayed) {
-          return;
+
+        // The merge conflict modal is displayed after clicking on the save button when there is a merge conflict.
+        // Clicking the save button again would reopen the same modal and reset the fields the user did not submit yet.
+        if (!$('#previewDiffModal').is(':visible')) {
+          $(`#${config.formId} [name="action_saveandcontinue"]`).click();
         }
+      };
 
-        saveRoutine(saveFinalizer);
+      // Prevent the save buttons from reloading the page. Instead, reset the editor's content.'
+      var overrideAjaxSaveAndContinue = function() {
+        var originalAjaxSaveAndContinue = $.extend({}, XWiki.actionButtons.AjaxSaveAndContinue.prototype);
+        $.extend(XWiki.actionButtons.AjaxSaveAndContinue.prototype, {
+          reloadEditor: function() {
+            // TODO: Handle the page title.
+            mainConfig.getTextAtCurrentRevision().then((data) => {mainConfig.setTextValue(data);});
+          }
+        });
       };
 
+      overrideAjaxSaveAndContinue();
       check();
     };
 
@@ -797,12 +474,6 @@ define('xwiki-realtime-saver', [
     }
     clearTimeout(mainConfig.autosaveTimeout);
     rtData = {};
-    // Remove the merge routine from the save buttons.
-    $(document).off([
-      'xwiki:actions:beforeSave.realtime-saver',
-      'xwiki:document:saved.realtime-saver',
-      'xwiki:document:saveFailed.realtime-saver'
-    ].join(' '));
   };
 
   Saver.setLastSavedContent = function(content) {
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js
index 494ffbba529d..b5e04d890739 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js
@@ -245,6 +245,11 @@ define('xwiki-realtime-wikiEditor', [
           getTextValue: function() {
             return editor.getValue();
           },
+          getTextAtCurrentRevision: function() {
+            return $.get(XWiki.currentDocument.getRestURL('', $.param({media:'json'}))).then(data => {
+              return data.content;
+            });
+          },
           realtime: info.realtime,
           userList: info.userList,
           userName: editorConfig.userName,
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
index fe625543c586..46782546ce37 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
@@ -90,6 +90,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Used to handle the edit conflict modal.  -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-flamingo-skin-test-pageobjects</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <!-- Realtime synchronization is done through WebSockets. -->
     <dependency>
       <groupId>javax.websocket</groupId>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index 51c5df3a7a7a..9308e1661781 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -34,6 +34,8 @@
 import org.xwiki.ckeditor.test.po.MacroDialogEditModal;
 import org.xwiki.ckeditor.test.po.image.ImageDialogEditModal;
 import org.xwiki.ckeditor.test.po.image.ImageDialogSelectModal;
+import org.xwiki.flamingo.skin.test.po.EditConflictModal;
+import org.xwiki.flamingo.skin.test.po.EditConflictModal.ConflictChoice;
 import org.xwiki.model.reference.AttachmentReference;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.realtime.wysiwyg.test.po.RealtimeCKEditor;
@@ -740,4 +742,125 @@ void editSameMacro(TestReference testReference, TestUtils setup)
         assertEquals("{{info cssClass=\"bar\" title=\"Some cool title\"}}\ntwo one\n{{/info}}\n\n ",
             WikiEditPage.gotoPage(testReference).getContent());
     }
+    
+    @Test
+    @Order(8)
+    void reloadEditorsMergeConflictManualSave(TestReference testReference, TestUtils setup)
+    {
+        //
+        // First Tab
+        //
+
+        // Start fresh.
+        setup.deletePage(testReference);
+
+        RealtimeWYSIWYGEditPage firstEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor firstEditor = firstEditPage.getContenEditor();
+        RealtimeRichTextAreaElement firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.sendKeys("First");
+        firstEditPage.clickSaveAndContinue();
+
+        //
+        // Second Tab
+        //
+
+        String secondTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+        RealtimeWYSIWYGEditPage secondEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
+        RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
+
+        secondTextArea.waitUntilContentContains("First");
+
+        //
+        // Third Tab
+        //
+
+        String thirdTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+        RealtimeWYSIWYGEditPage thirdEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor thirdEditor = thirdEditPage.getContenEditor();
+        RealtimeRichTextAreaElement thirdTextArea = thirdEditor.getRichTextArea();
+        thirdTextArea.waitUntilContentContains("First");
+
+        thirdEditPage.leaveRealtimeEditing();
+
+        thirdTextArea.sendKeys(Keys.END, " Second");
+        thirdEditPage.clickSaveAndContinue();
+
+        // First tab
+
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstTextArea.sendKeys(Keys.END, " First");
+        firstTextArea.waitUntilContentContains("First First");
+        firstEditPage.clickSaveAndContinue(false);
+
+        EditConflictModal editConflictModal = new EditConflictModal();
+        editConflictModal.makeChoiceAndSubmit(ConflictChoice.RELOAD, false);
+
+        firstTextArea.waitUntilContentContains("First Second");
+
+        // Second tab
+        setup.getDriver().switchTo().window(secondTabHandle);
+        secondTextArea.waitUntilContentContains("First Second");
+
+    }
+    
+    @Test
+    @Order(8)
+    void reloadEditorsSilentMergeConflictManualSave(TestReference testReference, TestUtils setup)
+    {
+        //
+        // First Tab
+        //
+
+        // Start fresh.
+        setup.deletePage(testReference);
+
+        RealtimeWYSIWYGEditPage firstEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor firstEditor = firstEditPage.getContenEditor();
+        RealtimeRichTextAreaElement firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.sendKeys("First");
+        firstEditPage.clickSaveAndContinue();
+
+        //
+        // Second Tab
+        //
+
+        String secondTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+        RealtimeWYSIWYGEditPage secondEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
+        RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
+
+        secondTextArea.waitUntilContentContains("First");
+
+        //
+        // Third Tab
+        //
+
+        String thirdTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+
+        RealtimeWYSIWYGEditPage thirdEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor thirdEditor = thirdEditPage.getContenEditor();
+        RealtimeRichTextAreaElement thirdTextArea = thirdEditor.getRichTextArea();
+        thirdTextArea.waitUntilContentContains("First");
+
+        thirdEditPage.leaveRealtimeEditing();
+
+        thirdTextArea.sendKeys(Keys.END, Keys.ENTER, "Second");
+        thirdEditPage.clickSaveAndContinue();
+
+        // First tab
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstEditPage.clickSaveAndContinue();
+
+        firstTextArea.waitUntilContentContains("First");
+        firstTextArea.waitUntilContentContains("Second");
+
+        // Second tab
+        setup.getDriver().switchTo().window(secondTabHandle);
+        secondTextArea.waitUntilContentContains("First");
+        secondTextArea.waitUntilContentContains("Second");
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java
index 2b45c2b5081b..9b11287daeba 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java
@@ -19,6 +19,7 @@
  */
 package org.xwiki.realtime.wysiwyg.test.po;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.xwiki.model.reference.EntityReference;
@@ -71,7 +72,7 @@ public void leaveRealtimeEditing()
     {
         if (isRealtimeEditing()) {
             this.allowRealtimeCheckbox.click();
-            // TODO: Handle the confirmation modal.
+            getDriver().findElement(By.cssSelector(".modal-popup .realtime-buttons .btn-primary")).click();
         }
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
index 8186706f2300..9477a788fe39 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
@@ -93,8 +93,10 @@ define('xwiki-realtime-wysiwyg-editor', [
      *
      * @param {Node[]} updatedNodes the DOM nodes that have been updated (added, modified directly or with removed
      *   descendants)
+     *
+     * @param {boolean} propagate true when the new content should be propagated to coeditors
      */
-    contentUpdated(updatedNodes) {
+    contentUpdated(updatedNodes, propagate) {
       try {
         this._initializeWidgets(updatedNodes);
       } catch (e) {
@@ -103,7 +105,7 @@ define('xwiki-realtime-wysiwyg-editor', [
 
       // Notify the content change (e.g. to update the empty line placeholders) without triggering our own change
       // handler (see #onChange()).
-      this._ckeditor.fire('change', {remote: true});
+      this._ckeditor.fire('change', {remote: !propagate});
     }
 
     /**
@@ -155,6 +157,16 @@ define('xwiki-realtime-wysiwyg-editor', [
       this._CKEDITOR.plugins.xwikiSelection.restoreSelection(this._ckeditor);
     }
 
+    /**
+     * Converts input data accepted by the editor to html that can be directly inserted in the editor's DOM.
+     *
+     * @param {string} data the data to be converted
+     * @returns {string} html representation of the input data that can be inserted in the editor's DOM.
+     */
+    convertDataToHtml(data) {
+      return this._ckeditor.dataProcessor.toHtml(data);
+    }
+
     _initializeWidgets(updatedNodes) {
       // Save the focused and selected widgets, as well as the widget holding the focused editable, so that we can
       // restore them after (re)initializing the widgets (if possible).
@@ -223,4 +235,4 @@ define('xwiki-realtime-wysiwyg-editor', [
   }
 
   return Editor;
-});
\ No newline at end of file
+});
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
index 6836180a53f2..1bbf9948e6c9 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
@@ -112,8 +112,10 @@ define('xwiki-realtime-wysiwyg-patches', [
      * 
      * @param {string} remoteFilteredHyperJSON the new normalized (filtered) content (usually the result of a remote
      *   change), serialized as HyperJSON
+     *
+     * @param {boolean} propagate true when the new content should be propagated to coeditors
      */
-    setHyperJSON(remoteFilteredHyperJSON) {
+    setHyperJSON(remoteFilteredHyperJSON, propagate) {
       let remoteHyperJSON;
       try {
         remoteHyperJSON = this._revertHyperJSONFilters(remoteFilteredHyperJSON);
@@ -137,32 +139,39 @@ define('xwiki-realtime-wysiwyg-patches', [
         return;
       }
 
-      this._updateContent(newContent);
+      this._updateContent(newContent, propagate);
     }
 
     /**
      * Update the editor content without affecting its caret / selection.
      * 
      * @param {string} html the new HTML content
+     * @param {boolean} propagate true when the new content should be propagated to coeditors
      */
-    setHTML(html) {
+    setHTML(html, propagate) {
+      const fixedHtml = this._editor.convertDataToHtml(html);
+
       let doc;
       try {
-        doc = new DOMParser().parseFromString(html, 'text/html');
+        doc = new DOMParser().parseFromString(fixedHtml, 'text/html');
       } catch (e) {
         console.error('Failed to parse the given HTML string: ' + html, e);
         return;
       }
 
-      this._updateContent(doc.body);
+      // We convert to HyperJSON and set the HyperJSON so that we can use the same filters
+      // as when receiving content from coeditors.
+      const hjson = Patches._stringifyNode(this._normalizeContent(doc.body), false);
+      this.setHyperJSON(hjson, propagate);
     }
 
     /**
      * Update the editor content without affecting its caret / selection.
      * 
      * @param {Node} newContent the new content to set, as a DOM node
+     * @param {boolean} propagate true when the new content should be propagated to coeditors
      */
-    _updateContent(newContent) {
+    _updateContent(newContent, propagate) {
       // Remember where the selection is, to be able to restore it in case the content update affects it.
       this._editor.saveSelection();
       const selection = this._editor.getSelection();
@@ -179,7 +188,7 @@ define('xwiki-realtime-wysiwyg-patches', [
         document: oldContent.ownerDocument
       });
 
-      this._editor.contentUpdated(this._diffDOM._updatedNodes);
+      this._editor.contentUpdated(this._diffDOM._updatedNodes, propagate);
 
       // Restore the selection if the editor had a selection (i.e. if the selection was inside the editing area) before
       // the content update and it was affected by the content update. Note that the selection restore focuses the
@@ -302,4 +311,4 @@ define('xwiki-realtime-wysiwyg-patches', [
   }
 
   return Patches;
-});
\ No newline at end of file
+});
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
index 99296bdc4016..9a7dd6787621 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
@@ -191,39 +191,7 @@ define('xwiki-realtime-wysiwyg', [
           // Id of the wiki page form.
           formId: window.XWiki.editor === 'wysiwyg' ? 'edit' : 'inline',
           setTextValue: function(newText, toConvert, callback) {
-            function andThen(data) {
-              patchedEditor.setHTML(data);
-
-              // If available, transform the HTML comments for XWiki macros into macros before saving
-              // (<!--startmacro:{...}-->). We can do that by using the "xwiki-refresh" command provided the by
-              // CKEditor Integration application.
-              if (editor.plugins['xwiki-macro'] && findMacroComments(genericEditor.getContent()).length > 0) {
-                initializing = true;
-                editor.execCommand('xwiki-refresh');
-                afterRefresh.push(callback);
-              } else {
-                callback();
-                realtimeOptions.onLocal();
-              }
-            }
-            if (toConvert) {
-              const object = {
-                wiki: XWiki.currentWiki,
-                space: XWiki.currentSpace,
-                page: XWiki.currentPage,
-                convert: true,
-                text: newText
-              };
-              $.post(editorConfig.htmlConverterUrl, object).then(andThen).catch(() => {
-                const debugLog = {
-                  state: editorId + '/convertHTML',
-                  postData: object
-                };
-                module.onAbort(null, 'converthtml', JSON.stringify(debugLog));
-              });
-            } else {
-              andThen(newText);
-            }
+            patchedEditor.setHTML(newText, true);
           },
           getSaveValue: function() {
             return {
@@ -240,6 +208,13 @@ define('xwiki-realtime-wysiwyg', [
               return null;
             }
           },
+          getTextAtCurrentRevision: function(revision) {
+            return $.get(XWiki.currentDocument.getURL('get', $.param({xpage:'get',
+                                                                      outputSyntax:'annotatedhtml',
+                                                                      outputSyntaxVersion:'5.0',
+                                                                      transformations:'macro',
+                                                                      rev:revision})));
+          },
           realtime: info.realtime,
           userList: info.userList,
           userName: editorConfig.userName,

From a89b698b19b1541628a7c9e40ed4a0ec2eb9a2eb Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 23 Jan 2024 09:14:09 +0100
Subject: [PATCH 038/143] XWIKI-21752: Email notifications events description
 do not display the user avatar anymore * remov e unused imports

---
 .../java/org/xwiki/web/NotificationMailDefaultHtmlTest.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
index a0a639cee12e..2cafc94346ba 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
@@ -53,12 +53,10 @@
 import com.xpn.xwiki.doc.XWikiDocument;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 /**

From d5cf37a2b1c7161e5cc8815275c54d91d8b3c452 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 10:55:37 +0200
Subject: [PATCH 039/143] XWIKI-21558: If a macro is modified by another user
 while the macro edit modal is open, we cannot update the macro * Fix failing
 test (restoring the focused and selected widgets by hand after an update is
 too fragile so better let CKEditor do it)

(cherry picked from commit 82aa87f83e4dec7026858dc889e4e456ab8bdeb4)
---
 .../src/main/webjar/editor.js                 | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
index 8186706f2300..cae23f3be68c 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
@@ -156,11 +156,11 @@ define('xwiki-realtime-wysiwyg-editor', [
     }
 
     _initializeWidgets(updatedNodes) {
-      // Save the focused and selected widgets, as well as the widget holding the focused editable, so that we can
-      // restore them after (re)initializing the widgets (if possible).
-      const focusedWidgetWrapper = this._ckeditor.widgets.focused?.wrapper;
-      const selectedWidgetWrappers = this._ckeditor.widgets.selected.map(widget => widget.wrapper);
-      const widgetHoldingFocusedEditableWrapper = this._ckeditor.widgets.widgetHoldingFocusedEditable?.wrapper;
+      // Reset the focused and selected widgets, as well as the widget holding the focused editable because they may
+      // have been invalidated by the DOM changes.
+      this._ckeditor.widgets.focused = null;
+      this._ckeditor.widgets.selected = [];
+      this._ckeditor.widgets.widgetHoldingFocusedEditable = null;
 
       // Find the widgets that need to be reinitialized because some of their content was updated.
       const updatedWidgets = new Set();
@@ -192,19 +192,9 @@ define('xwiki-realtime-wysiwyg-editor', [
       // the DOM.
       this._ckeditor.widgets.checkWidgets();
 
-      // Update the focused and selected widgets, as well as the widget holding the focused editable.
-      if (focusedWidgetWrapper) {
-        const focusedWidget = this._ckeditor.widgets.getByElement(focusedWidgetWrapper, true);
-        this._ckeditor.widgets.focused = focusedWidget;
-      }
-      this._ckeditor.widgets.selected = selectedWidgetWrappers.map(widgetWrapper =>
-        this._ckeditor.widgets.getByElement(widgetWrapper, true)
-      ).filter(widget => !!widget);
-      if (widgetHoldingFocusedEditableWrapper) {
-        const widgetHoldingFocusedEditable = this._ckeditor.widgets.getByElement(widgetHoldingFocusedEditableWrapper,
-          true);
-        this._ckeditor.widgets.widgetHoldingFocusedEditable = widgetHoldingFocusedEditable;
-      }
+      // Update the focused and selected widgets, as well as the widget holding the focused editable, after the
+      // selection is restored.
+      setTimeout(() => this._ckeditor.widgets.checkSelection(), 0);
     }
 
     _onContentLoaded() {

From 79abddec346242bfc11a78023e0751a4dbed4bc3 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 12:18:30 +0200
Subject: [PATCH 040/143] Update
 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js

Fix typo.
---
 .../xwiki-platform-realtime-webjar/src/main/webjar/saver.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
index 4857ce619928..338dceec9f8f 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
@@ -391,7 +391,7 @@ define('xwiki-realtime-saver', [
         }
       };
 
-      // Prevent the save buttons from reloading the page. Instead, reset the editor's content.'
+      // Prevent the save buttons from reloading the page. Instead, reset the editor's content.
       var overrideAjaxSaveAndContinue = function() {
         var originalAjaxSaveAndContinue = $.extend({}, XWiki.actionButtons.AjaxSaveAndContinue.prototype);
         $.extend(XWiki.actionButtons.AjaxSaveAndContinue.prototype, {

From 9be71d4d3cbe3dcc9d7ec794cec8dec11d5d93fb Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 12:18:55 +0200
Subject: [PATCH 041/143] Update
 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Update test order.
---
 .../xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index 9308e1661781..4674175ea95c 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -744,7 +744,7 @@ void editSameMacro(TestReference testReference, TestUtils setup)
     }
     
     @Test
-    @Order(8)
+    @Order(9)
     void reloadEditorsMergeConflictManualSave(TestReference testReference, TestUtils setup)
     {
         //

From 9099044e8e495305b783a439d1a3e003f71f81eb Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 12:19:12 +0200
Subject: [PATCH 042/143] Update
 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Remove extra empty line.
---
 .../xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index 4674175ea95c..5a806c83f78e 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -803,7 +803,6 @@ void reloadEditorsMergeConflictManualSave(TestReference testReference, TestUtils
         // Second tab
         setup.getDriver().switchTo().window(secondTabHandle);
         secondTextArea.waitUntilContentContains("First Second");
-
     }
     
     @Test

From 84a1f0065131f2b99e26ad178d09db42e6cb234a Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 12:19:41 +0200
Subject: [PATCH 043/143] Update
 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Update test order.
---
 .../xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index 5a806c83f78e..ea3d7f47b29b 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -806,7 +806,7 @@ void reloadEditorsMergeConflictManualSave(TestReference testReference, TestUtils
     }
     
     @Test
-    @Order(8)
+    @Order(10)
     void reloadEditorsSilentMergeConflictManualSave(TestReference testReference, TestUtils setup)
     {
         //

From 67cf53533fcabcf6afafb177c1c365ae6a1ca6f7 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 16:22:34 +0100
Subject: [PATCH 044/143] [maven-release-plugin] prepare branch @{releaseLabel}

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a742534d33c..9f39012fc304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
          By using an empty value we force Maven to resolve the parent from the Maven repositories,
          see http://maven.apache.org/ref/3.2.3/maven-model/maven.html#class_parent
     -->
-    <relativePath/>
+    <relativePath />
   </parent>
   <groupId>org.xwiki.platform</groupId>
   <artifactId>xwiki-platform</artifactId>
@@ -124,7 +124,7 @@
     <connection>scm:git:git://github.com/xwiki/xwiki-platform.git</connection>
     <developerConnection>scm:git:git@github.com:xwiki/xwiki-platform.git</developerConnection>
     <url>https://github.com/xwiki/xwiki-platform/tree/master/</url>
-    <tag>stable-12.7.x</tag>
+    <tag>stable-16.0.x</tag>
   </scm>
   <issueManagement>
     <system>jira</system>

From 20d6d999a56dafc969ee92ef56b01b67f0a83555 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 16:22:36 +0100
Subject: [PATCH 045/143] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml                                                |  4 ++--
 xwiki-platform-core/pom.xml                            |  2 +-
 .../xwiki-platform-activeinstalls2/pom.xml             |  2 +-
 .../xwiki-platform-activeinstalls2-api/pom.xml         |  2 +-
 .../xwiki-platform-activeinstalls2-test/pom.xml        |  2 +-
 .../xwiki-platform-activeinstalls2-test-docker/pom.xml |  2 +-
 .../xwiki-platform-administration/pom.xml              |  2 +-
 .../xwiki-platform-administration-test/pom.xml         |  2 +-
 .../xwiki-platform-administration-test-docker/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-administration-ui/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-alerts/pom.xml      |  4 ++--
 .../xwiki-platform-alerts-ui/pom.xml                   |  4 ++--
 xwiki-platform-core/xwiki-platform-annotation/pom.xml  |  2 +-
 .../xwiki-platform-annotation-core/pom.xml             |  2 +-
 .../xwiki-platform-annotation-io/pom.xml               |  2 +-
 .../xwiki-platform-annotation-maintainer/pom.xml       |  2 +-
 .../xwiki-platform-annotation-reference/pom.xml        |  2 +-
 .../xwiki-platform-annotation-rest/pom.xml             |  2 +-
 .../xwiki-platform-annotation-scripting/pom.xml        |  2 +-
 .../xwiki-platform-annotation-test/pom.xml             |  2 +-
 .../xwiki-platform-annotation-test-docker/pom.xml      |  2 +-
 .../xwiki-platform-annotation-test-pageobjects/pom.xml |  2 +-
 .../xwiki-platform-annotation-ui/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-application/pom.xml |  2 +-
 .../xwiki-platform-application-test/pom.xml            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-application-ui/pom.xml              |  2 +-
 .../xwiki-platform-appwithinminutes/pom.xml            |  2 +-
 .../xwiki-platform-appwithinminutes-test/pom.xml       |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-appwithinminutes-ui/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-attachment/pom.xml  |  2 +-
 .../xwiki-platform-attachment-api/pom.xml              |  2 +-
 .../xwiki-platform-attachment-picker/pom.xml           |  2 +-
 .../xwiki-platform-attachment-picker-macro/pom.xml     |  2 +-
 .../xwiki-platform-attachment-picker-test/pom.xml      |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-attachment-picker-ui/pom.xml        |  2 +-
 .../xwiki-platform-attachment-picker-webjar/pom.xml    |  2 +-
 .../xwiki-platform-attachment-test/pom.xml             |  2 +-
 .../xwiki-platform-attachment-test-docker/pom.xml      |  2 +-
 .../xwiki-platform-attachment-test-pageobjects/pom.xml |  2 +-
 .../xwiki-platform-attachment-ui/pom.xml               |  2 +-
 .../xwiki-platform-attachment-validation/pom.xml       |  2 +-
 .../xwiki-platform-attachment-validation-api/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-attachment-validation-test/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-attachment-validation-ui/pom.xml    |  2 +-
 xwiki-platform-core/xwiki-platform-bridge/pom.xml      |  2 +-
 xwiki-platform-core/xwiki-platform-captcha/pom.xml     |  2 +-
 .../xwiki-platform-captcha-api/pom.xml                 |  2 +-
 .../xwiki-platform-captcha-default/pom.xml             |  2 +-
 .../xwiki-platform-captcha-jcaptcha/pom.xml            |  2 +-
 .../xwiki-platform-captcha-jcaptcha-api/pom.xml        |  2 +-
 .../xwiki-platform-captcha-jcaptcha-ui/pom.xml         |  2 +-
 .../xwiki-platform-captcha-jcaptcha-webjar/pom.xml     |  2 +-
 .../xwiki-platform-captcha-ui/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-chart/pom.xml       |  2 +-
 .../xwiki-platform-chart-macro/pom.xml                 |  2 +-
 .../xwiki-platform-chart-renderer/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-ckeditor/pom.xml    |  2 +-
 .../xwiki-platform-ckeditor-plugins/pom.xml            |  2 +-
 .../xwiki-platform-ckeditor-test/pom.xml               |  2 +-
 .../xwiki-platform-ckeditor-test-docker/pom.xml        |  2 +-
 .../xwiki-platform-ckeditor-test-pageobjects/pom.xml   |  2 +-
 .../xwiki-platform-ckeditor-ui/pom.xml                 |  2 +-
 .../xwiki-platform-ckeditor-webjar/pom.xml             |  2 +-
 xwiki-platform-core/xwiki-platform-classloader/pom.xml |  2 +-
 .../xwiki-platform-classloader-protocols/pom.xml       |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-classloader-xwiki/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-component/pom.xml   |  2 +-
 .../xwiki-platform-component-multi/pom.xml             |  2 +-
 .../xwiki-platform-component-script/pom.xml            |  2 +-
 .../xwiki-platform-component-wiki/pom.xml              |  2 +-
 .../xwiki-platform-configuration/pom.xml               |  2 +-
 .../xwiki-platform-configuration-api/pom.xml           |  2 +-
 .../xwiki-platform-configuration-default/pom.xml       |  2 +-
 xwiki-platform-core/xwiki-platform-container/pom.xml   |  2 +-
 .../xwiki-platform-container-api/pom.xml               |  2 +-
 .../xwiki-platform-container-portlet/pom.xml           |  2 +-
 .../xwiki-platform-container-servlet/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-crypto/pom.xml      |  2 +-
 .../xwiki-platform-crypto-script/pom.xml               |  2 +-
 .../xwiki-platform-crypto-store/pom.xml                |  2 +-
 .../xwiki-platform-crypto-store-api/pom.xml            |  2 +-
 .../xwiki-platform-crypto-store-wiki/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-csrf/pom.xml        |  2 +-
 xwiki-platform-core/xwiki-platform-dashboard/pom.xml   |  2 +-
 .../xwiki-platform-dashboard-macro/pom.xml             |  2 +-
 .../xwiki-platform-dashboard-test/pom.xml              |  2 +-
 .../xwiki-platform-dashboard-test-docker/pom.xml       |  2 +-
 .../xwiki-platform-dashboard-test-pageobjects/pom.xml  |  2 +-
 .../xwiki-platform-dashboard-ui/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-date/pom.xml        |  2 +-
 xwiki-platform-core/xwiki-platform-diff/pom.xml        |  2 +-
 .../xwiki-platform-diff-xml/pom.xml                    |  2 +-
 xwiki-platform-core/xwiki-platform-display/pom.xml     |  2 +-
 .../xwiki-platform-display-api/pom.xml                 |  2 +-
 .../xwiki-platform-display-html/pom.xml                |  2 +-
 .../xwiki-platform-display-macro/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-edit/pom.xml        |  2 +-
 .../xwiki-platform-edit-api/pom.xml                    |  2 +-
 .../xwiki-platform-edit-default/pom.xml                |  2 +-
 .../xwiki-platform-edit-test/pom.xml                   |  2 +-
 .../xwiki-platform-edit-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-edit-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-eventstream/pom.xml |  2 +-
 .../xwiki-platform-eventstream-api/pom.xml             |  2 +-
 .../xwiki-platform-eventstream-default/pom.xml         |  2 +-
 .../xwiki-platform-eventstream-stores/pom.xml          |  2 +-
 .../xwiki-platform-eventstream-store-common/pom.xml    |  2 +-
 .../xwiki-platform-eventstream-store-solr/pom.xml      |  2 +-
 xwiki-platform-core/xwiki-platform-export/pom.xml      |  2 +-
 .../xwiki-platform-export-api/pom.xml                  |  2 +-
 .../xwiki-platform-export-pdf/pom.xml                  |  2 +-
 .../xwiki-platform-export-pdf-api/pom.xml              |  2 +-
 .../xwiki-platform-export-pdf-default/pom.xml          |  2 +-
 .../xwiki-platform-export-pdf-test/pom.xml             |  2 +-
 .../xwiki-platform-export-pdf-test-content/pom.xml     |  2 +-
 .../xwiki-platform-export-pdf-test-docker/pom.xml      |  2 +-
 .../xwiki-platform-export-pdf-test-pageobjects/pom.xml |  2 +-
 .../xwiki-platform-export-pdf-ui/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-extension/pom.xml   |  2 +-
 .../xwiki-platform-extension-api/pom.xml               |  2 +-
 .../xwiki-platform-extension-cluster/pom.xml           |  2 +-
 .../xwiki-platform-extension-distribution/pom.xml      |  2 +-
 .../xwiki-platform-extension-handlers/pom.xml          |  2 +-
 .../xwiki-platform-extension-handler-jar/pom.xml       |  2 +-
 .../xwiki-platform-extension-handler-xar/pom.xml       |  2 +-
 .../xwiki-platform-extension-index/pom.xml             |  2 +-
 .../xwiki-platform-extension-script/pom.xml            |  2 +-
 .../xwiki-platform-extension-security/pom.xml          |  2 +-
 .../xwiki-platform-extension-security-api/pom.xml      |  2 +-
 .../xwiki-platform-extension-security-index/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-extension-security-test/pom.xml     |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-extension-security-ui/pom.xml       |  2 +-
 .../xwiki-platform-extension-test/pom.xml              |  2 +-
 .../xwiki-platform-extension-test-pageobjects/pom.xml  |  2 +-
 .../xwiki-platform-extension-test-tests/pom.xml        |  2 +-
 .../xwiki-platform-extension-test-utils/pom.xml        |  2 +-
 .../xwiki-platform-extension-ui/pom.xml                |  2 +-
 .../xwiki-platform-extension-versioncheck/pom.xml      |  2 +-
 xwiki-platform-core/xwiki-platform-feed/pom.xml        |  2 +-
 .../xwiki-platform-feed-api/pom.xml                    |  2 +-
 xwiki-platform-core/xwiki-platform-filter/pom.xml      |  2 +-
 .../xwiki-platform-filter-events/pom.xml               |  2 +-
 .../xwiki-platform-filter-event-model/pom.xml          |  2 +-
 .../xwiki-platform-filter-event-user/pom.xml           |  2 +-
 .../xwiki-platform-filter-event-xwiki/pom.xml          |  2 +-
 .../xwiki-platform-filter-instance/pom.xml             |  2 +-
 .../xwiki-platform-filter-instance-api/pom.xml         |  2 +-
 .../xwiki-platform-filter-instance-document/pom.xml    |  2 +-
 .../xwiki-platform-filter-instance-extension/pom.xml   |  2 +-
 .../xwiki-platform-filter-instance-script/pom.xml      |  2 +-
 .../xwiki-platform-filter-script/pom.xml               |  2 +-
 .../xwiki-platform-filter-streams/pom.xml              |  2 +-
 .../xwiki-platform-filter-stream-xar/pom.xml           |  2 +-
 .../xwiki-platform-filter-test/pom.xml                 |  2 +-
 .../xwiki-platform-filter-test-tests/pom.xml           |  2 +-
 .../xwiki-platform-filter-ui/pom.xml                   |  2 +-
 xwiki-platform-core/xwiki-platform-flamingo/pom.xml    |  2 +-
 .../xwiki-platform-flamingo-skin/pom.xml               |  2 +-
 .../xwiki-platform-flamingo-skin-resources/pom.xml     |  2 +-
 .../xwiki-platform-flamingo-skin-test/pom.xml          |  2 +-
 .../xwiki-platform-flamingo-skin-test-docker/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-flamingo-skin-test-tests/pom.xml    |  2 +-
 .../xwiki-platform-flamingo-theme/pom.xml              |  2 +-
 .../xwiki-platform-flamingo-theme-bootswatch/pom.xml   |  2 +-
 .../xwiki-platform-flamingo-theme-test/pom.xml         |  2 +-
 .../xwiki-platform-flamingo-theme-test-docker/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-flamingo-theme-ui/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-flavor/pom.xml      |  2 +-
 .../xwiki-platform-flavor-api/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-groovy/pom.xml      |  2 +-
 xwiki-platform-core/xwiki-platform-help/pom.xml        |  2 +-
 .../xwiki-platform-help-test/pom.xml                   |  2 +-
 .../xwiki-platform-help-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-help/xwiki-platform-help-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-icon/pom.xml        |  2 +-
 .../xwiki-platform-icon-api/pom.xml                    |  2 +-
 .../xwiki-platform-icon-default/pom.xml                |  2 +-
 .../xwiki-platform-icon-fontawesome/pom.xml            |  2 +-
 .../xwiki-platform-icon-macro/pom.xml                  |  2 +-
 .../xwiki-platform-icon-rest/pom.xml                   |  2 +-
 .../xwiki-platform-icon-rest-api/pom.xml               |  2 +-
 .../xwiki-platform-icon-rest-default/pom.xml           |  2 +-
 .../xwiki-platform-icon-script/pom.xml                 |  2 +-
 .../xwiki-platform-icon-test/pom.xml                   |  2 +-
 .../xwiki-platform-icon-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-image/pom.xml       |  2 +-
 .../xwiki-platform-image-lightbox/pom.xml              |  2 +-
 .../xwiki-platform-image-lightbox-test/pom.xml         |  2 +-
 .../xwiki-platform-image-lightbox-test-docker/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-image-lightbox-ui/pom.xml           |  2 +-
 .../xwiki-platform-image-lightbox-webjar/pom.xml       |  2 +-
 .../xwiki-platform-image-processing/pom.xml            |  2 +-
 .../xwiki-platform-image-processing-api/pom.xml        |  2 +-
 .../xwiki-platform-image-processing-plugin/pom.xml     |  2 +-
 .../xwiki-platform-image-style/pom.xml                 |  2 +-
 .../xwiki-platform-image-style-api/pom.xml             |  2 +-
 .../xwiki-platform-image-style-model/pom.xml           |  2 +-
 .../xwiki-platform-image-style-rest/pom.xml            |  2 +-
 .../xwiki-platform-image-style-test/pom.xml            |  2 +-
 .../xwiki-platform-image-style-test-docker/pom.xml     |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-image-style-ui/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-index/pom.xml       |  2 +-
 .../xwiki-platform-index-api/pom.xml                   |  2 +-
 .../xwiki-platform-index-default/pom.xml               |  2 +-
 .../xwiki-platform-index-test/pom.xml                  |  2 +-
 .../xwiki-platform-index-test-docker/pom.xml           |  2 +-
 .../xwiki-platform-index-test-pageobjects/pom.xml      |  2 +-
 .../xwiki-platform-index-test-tests/pom.xml            |  2 +-
 .../xwiki-platform-index-tree/pom.xml                  |  2 +-
 .../xwiki-platform-index-tree-api/pom.xml              |  2 +-
 .../xwiki-platform-index-tree-macro/pom.xml            |  2 +-
 .../xwiki-platform-index-tree-test/pom.xml             |  2 +-
 .../xwiki-platform-index-tree-test-pageobjects/pom.xml |  2 +-
 .../xwiki-platform-index-tree-war/pom.xml              |  2 +-
 .../xwiki-platform-index-ui/pom.xml                    |  2 +-
 xwiki-platform-core/xwiki-platform-instance/pom.xml    |  2 +-
 xwiki-platform-core/xwiki-platform-invitation/pom.xml  |  2 +-
 .../xwiki-platform-invitation-test/pom.xml             |  2 +-
 .../xwiki-platform-invitation-test-docker/pom.xml      |  2 +-
 .../xwiki-platform-invitation-test-pageobject/pom.xml  |  2 +-
 .../xwiki-platform-invitation-ui/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-job/pom.xml         |  2 +-
 .../xwiki-platform-job/xwiki-platform-job-api/pom.xml  |  2 +-
 .../xwiki-platform-job-handler/pom.xml                 |  2 +-
 .../xwiki-platform-job-script/pom.xml                  |  2 +-
 .../xwiki-platform-job-webjar/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-jodatime/pom.xml    |  2 +-
 xwiki-platform-core/xwiki-platform-legacy/pom.xml      |  2 +-
 .../xwiki-platform-legacy-annotation/pom.xml           |  2 +-
 .../xwiki-platform-legacy-events-hibernate/pom.xml     |  2 +-
 .../xwiki-platform-legacy-events-hibernate-api/pom.xml |  2 +-
 .../xwiki-platform-legacy-events-hibernate-ui/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-instance/pom.xml             |  2 +-
 .../xwiki-platform-legacy-mail/pom.xml                 |  2 +-
 .../xwiki-platform-legacy-mail-send/pom.xml            |  2 +-
 .../xwiki-platform-legacy-mail-send-default/pom.xml    |  2 +-
 .../xwiki-platform-legacy-mail-send-storage/pom.xml    |  2 +-
 .../xwiki-platform-legacy-model-api/pom.xml            |  2 +-
 .../xwiki-platform-legacy-notifications/pom.xml        |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-notifications-api/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-observation/pom.xml          |  2 +-
 .../xwiki-platform-legacy-office/pom.xml               |  2 +-
 .../xwiki-platform-legacy-office-importer/pom.xml      |  2 +-
 .../xwiki-platform-legacy-office-viewer/pom.xml        |  2 +-
 .../xwiki-platform-legacy-oldcore/pom.xml              |  2 +-
 .../xwiki-platform-legacy-refactoring/pom.xml          |  2 +-
 .../xwiki-platform-legacy-refactoring-api/pom.xml      |  2 +-
 .../xwiki-platform-legacy-rendering/pom.xml            |  2 +-
 .../xwiki-platform-legacy-rendering-macros/pom.xml     |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-rendering-wikimacro/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-resource/pom.xml             |  2 +-
 .../xwiki-platform-legacy-resource-temporary/pom.xml   |  2 +-
 .../xwiki-platform-legacy-security/pom.xml             |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-legacy-url/pom.xml                  |  2 +-
 .../xwiki-platform-legacy-web/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-lesscss/pom.xml     |  2 +-
 .../xwiki-platform-lesscss-api/pom.xml                 |  2 +-
 .../xwiki-platform-lesscss-default/pom.xml             |  2 +-
 .../xwiki-platform-lesscss-script/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-like/pom.xml        |  2 +-
 .../xwiki-platform-like-api/pom.xml                    |  2 +-
 .../xwiki-platform-like-notifications/pom.xml          |  2 +-
 .../xwiki-platform-like-test/pom.xml                   |  2 +-
 .../xwiki-platform-like-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-like-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-like/xwiki-platform-like-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-link/pom.xml        |  2 +-
 xwiki-platform-core/xwiki-platform-linkchecker/pom.xml |  2 +-
 .../xwiki-platform-linkchecker-api/pom.xml             |  2 +-
 .../xwiki-platform-linkchecker-test/pom.xml            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-linkchecker-test-tests/pom.xml      |  2 +-
 .../xwiki-platform-linkchecker-ui/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-livedata/pom.xml    |  2 +-
 .../xwiki-platform-livedata-api/pom.xml                |  2 +-
 .../xwiki-platform-livedata-livetable/pom.xml          |  2 +-
 .../xwiki-platform-livedata-macro/pom.xml              |  2 +-
 .../xwiki-platform-livedata-rest/pom.xml               |  2 +-
 .../xwiki-platform-livedata-test/pom.xml               |  2 +-
 .../xwiki-platform-livedata-test-docker/pom.xml        |  2 +-
 .../xwiki-platform-livedata-test-pageobjects/pom.xml   |  2 +-
 .../xwiki-platform-livedata-war/pom.xml                |  2 +-
 .../xwiki-platform-livedata-webjar/pom.xml             |  2 +-
 xwiki-platform-core/xwiki-platform-livetable/pom.xml   |  2 +-
 .../xwiki-platform-livetable-ui/pom.xml                |  2 +-
 .../xwiki-platform-localization/pom.xml                |  2 +-
 .../xwiki-platform-localization-api/pom.xml            |  2 +-
 .../xwiki-platform-localization-macro/pom.xml          |  2 +-
 .../xwiki-platform-localization-rest/pom.xml           |  2 +-
 .../xwiki-platform-localization-rest-api/pom.xml       |  2 +-
 .../xwiki-platform-localization-rest-default/pom.xml   |  2 +-
 .../xwiki-platform-localization-script/pom.xml         |  2 +-
 .../xwiki-platform-localization-sources/pom.xml        |  2 +-
 .../xwiki-platform-localization-source-jar/pom.xml     |  2 +-
 .../xwiki-platform-localization-source-legacy/pom.xml  |  2 +-
 .../xwiki-platform-localization-source-wiki/pom.xml    |  2 +-
 .../xwiki-platform-localization-syntaxes/pom.xml       |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-localization-test/pom.xml           |  2 +-
 .../xwiki-platform-localization-test-docker/pom.xml    |  2 +-
 .../xwiki-platform-localization-webjar/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-logging/pom.xml     |  2 +-
 .../xwiki-platform-logging-script/pom.xml              |  2 +-
 .../xwiki-platform-logging-ui/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-mail/pom.xml        |  2 +-
 .../xwiki-platform-mail-api/pom.xml                    |  2 +-
 .../xwiki-platform-mail-general/pom.xml                |  2 +-
 .../xwiki-platform-mail-resender-ui/pom.xml            |  2 +-
 .../xwiki-platform-mail-script/pom.xml                 |  2 +-
 .../xwiki-platform-mail-send/pom.xml                   |  2 +-
 .../xwiki-platform-mail-send-api/pom.xml               |  2 +-
 .../xwiki-platform-mail-send-default/pom.xml           |  2 +-
 .../xwiki-platform-mail-send-storage/pom.xml           |  2 +-
 .../xwiki-platform-mail-test/pom.xml                   |  2 +-
 .../xwiki-platform-mail-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-mail-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-mailsender/pom.xml  |  2 +-
 xwiki-platform-core/xwiki-platform-mentions/pom.xml    |  2 +-
 .../xwiki-platform-mentions-api/pom.xml                |  2 +-
 .../xwiki-platform-mentions-default/pom.xml            |  2 +-
 .../xwiki-platform-mentions-notifications/pom.xml      |  2 +-
 .../xwiki-platform-mentions-test/pom.xml               |  2 +-
 .../xwiki-platform-mentions-test-docker/pom.xml        |  2 +-
 .../xwiki-platform-mentions-test-pageobjects/pom.xml   |  2 +-
 .../xwiki-platform-mentions-ui/pom.xml                 |  2 +-
 xwiki-platform-core/xwiki-platform-menu/pom.xml        |  2 +-
 .../xwiki-platform-menu-test/pom.xml                   |  2 +-
 .../xwiki-platform-menu-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-menu-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml |  2 +-
 .../xwiki-platform-messagestream/pom.xml               |  2 +-
 .../xwiki-platform-messagestream-api/pom.xml           |  2 +-
 .../xwiki-platform-messagestream-test/pom.xml          |  2 +-
 .../xwiki-platform-messagestream-test-tests/pom.xml    |  2 +-
 .../xwiki-platform-messagestream-ui/pom.xml            |  2 +-
 .../xwiki-platform-minimaldependencies/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-model/pom.xml       |  2 +-
 .../xwiki-platform-model-api/pom.xml                   |  2 +-
 .../xwiki-platform-model-validation/pom.xml            |  2 +-
 .../xwiki-platform-model-validation-api/pom.xml        |  2 +-
 .../xwiki-platform-model-validation-default/pom.xml    |  2 +-
 .../xwiki-platform-model-validation-ui/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-netflux/pom.xml     |  2 +-
 .../xwiki-platform-netflux-api/pom.xml                 |  2 +-
 .../xwiki-platform-netflux-rest/pom.xml                |  2 +-
 .../xwiki-platform-notifications/pom.xml               |  2 +-
 .../xwiki-platform-notifications-api/pom.xml           |  2 +-
 .../xwiki-platform-notifications-filters/pom.xml       |  2 +-
 .../xwiki-platform-notifications-filters-api/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-notifications-filters-watch/pom.xml |  2 +-
 .../xwiki-platform-notifications-macro/pom.xml         |  2 +-
 .../xwiki-platform-notifications-macro-ui/pom.xml      |  2 +-
 .../xwiki-platform-notifications-notifiers/pom.xml     |  2 +-
 .../xwiki-platform-notifications-notifiers-api/pom.xml |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-notifications-preferences/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-notifications-rest/pom.xml          |  2 +-
 .../xwiki-platform-notifications-script/pom.xml        |  2 +-
 .../xwiki-platform-notifications-sources/pom.xml       |  2 +-
 .../xwiki-platform-notifications-test/pom.xml          |  2 +-
 .../xwiki-platform-notifications-test-docker/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-notifications-ui/pom.xml            |  2 +-
 xwiki-platform-core/xwiki-platform-observation/pom.xml |  2 +-
 .../xwiki-platform-observation-remote/pom.xml          |  2 +-
 .../xwiki-platform-observation-test/pom.xml            |  2 +-
 .../xwiki-platform-observation-test-tests/pom.xml      |  2 +-
 xwiki-platform-core/xwiki-platform-office/pom.xml      |  2 +-
 .../xwiki-platform-office-importer/pom.xml             |  2 +-
 .../xwiki-platform-office-macro/pom.xml                |  2 +-
 .../xwiki-platform-office-test/pom.xml                 |  2 +-
 .../xwiki-platform-office-test-docker/pom.xml          |  2 +-
 .../xwiki-platform-office-test-pageobjects/pom.xml     |  2 +-
 .../xwiki-platform-office-ui/pom.xml                   |  2 +-
 .../xwiki-platform-office-viewer/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-oldcore/pom.xml     |  2 +-
 xwiki-platform-core/xwiki-platform-panels/pom.xml      |  2 +-
 .../xwiki-platform-panels-api/pom.xml                  |  2 +-
 .../xwiki-platform-panels-test/pom.xml                 |  2 +-
 .../xwiki-platform-panels-test-content/pom.xml         |  2 +-
 .../xwiki-platform-panels-test-docker/pom.xml          |  2 +-
 .../xwiki-platform-panels-test-pageobjects/pom.xml     |  2 +-
 .../xwiki-platform-panels-test-tests/pom.xml           |  2 +-
 .../xwiki-platform-panels-ui/pom.xml                   |  2 +-
 xwiki-platform-core/xwiki-platform-query/pom.xml       |  2 +-
 .../xwiki-platform-query-jpql-parser/pom.xml           |  2 +-
 .../xwiki-platform-query-manager/pom.xml               |  2 +-
 .../xwiki-platform-query-xwql/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-ratings/pom.xml     |  2 +-
 .../xwiki-platform-ratings-api/pom.xml                 |  2 +-
 .../xwiki-platform-ratings-ui/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-realtime/pom.xml    |  2 +-
 .../xwiki-platform-realtime-ui/pom.xml                 |  2 +-
 .../xwiki-platform-realtime-webjar/pom.xml             |  2 +-
 .../xwiki-platform-realtime-wiki/pom.xml               |  2 +-
 .../xwiki-platform-realtime-wiki-test/pom.xml          |  2 +-
 .../xwiki-platform-realtime-wiki-test-docker/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-realtime-wiki-ui/pom.xml            |  2 +-
 .../xwiki-platform-realtime-wiki-webjar/pom.xml        |  2 +-
 .../xwiki-platform-realtime-wysiwyg/pom.xml            |  2 +-
 .../xwiki-platform-realtime-wysiwyg-test/pom.xml       |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-realtime-wysiwyg-ui/pom.xml         |  2 +-
 .../xwiki-platform-realtime-wysiwyg-webjar/pom.xml     |  2 +-
 xwiki-platform-core/xwiki-platform-refactoring/pom.xml |  2 +-
 .../xwiki-platform-refactoring-api/pom.xml             |  2 +-
 .../xwiki-platform-refactoring-default/pom.xml         |  2 +-
 .../xwiki-platform-refactoring-ui/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-release/pom.xml     |  2 +-
 .../xwiki-platform-release-test/pom.xml                |  2 +-
 .../xwiki-platform-release-test-docker/pom.xml         |  2 +-
 .../xwiki-platform-release-test-pageobjects/pom.xml    |  2 +-
 .../xwiki-platform-release-ui/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-rendering/pom.xml   |  2 +-
 .../xwiki-platform-rendering-async/pom.xml             |  2 +-
 .../xwiki-platform-rendering-async-api/pom.xml         |  2 +-
 .../xwiki-platform-rendering-async-default/pom.xml     |  2 +-
 .../xwiki-platform-rendering-async-macro/pom.xml       |  2 +-
 .../xwiki-platform-rendering-configuration/pom.xml     |  2 +-
 .../xwiki-platform-rendering-configuration-api/pom.xml |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-rendering-macros/pom.xml            |  2 +-
 .../xwiki-platform-rendering-macro-cache/pom.xml       |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-rendering-macro-code/pom.xml        |  2 +-
 .../xwiki-platform-rendering-macro-container/pom.xml   |  2 +-
 .../xwiki-platform-rendering-macro-context/pom.xml     |  2 +-
 .../xwiki-platform-rendering-macro-gallery/pom.xml     |  2 +-
 .../xwiki-platform-rendering-macro-groovy/pom.xml      |  2 +-
 .../xwiki-platform-rendering-macro-include/pom.xml     |  2 +-
 .../xwiki-platform-rendering-macro-python/pom.xml      |  2 +-
 .../xwiki-platform-rendering-macro-script/pom.xml      |  2 +-
 .../xwiki-platform-rendering-macro-toc/pom.xml         |  2 +-
 .../xwiki-platform-rendering-macro-useravatar/pom.xml  |  2 +-
 .../xwiki-platform-rendering-macro-velocity/pom.xml    |  2 +-
 .../xwiki-platform-rendering-parser/pom.xml            |  2 +-
 .../xwiki-platform-rendering-signature/pom.xml         |  2 +-
 .../xwiki-platform-rendering-transformations/pom.xml   |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-rendering-ui/pom.xml                |  2 +-
 .../xwiki-platform-rendering-wikimacro/pom.xml         |  2 +-
 .../xwiki-platform-rendering-wikimacro-api/pom.xml     |  2 +-
 .../xwiki-platform-rendering-wikimacro-store/pom.xml   |  2 +-
 .../xwiki-platform-rendering-xwiki/pom.xml             |  2 +-
 xwiki-platform-core/xwiki-platform-repository/pom.xml  |  2 +-
 .../xwiki-platform-repository-server-api/pom.xml       |  2 +-
 .../xwiki-platform-repository-server-ui/pom.xml        |  2 +-
 .../xwiki-platform-repository-test/pom.xml             |  2 +-
 .../xwiki-platform-repository-test-pageobjects/pom.xml |  2 +-
 .../xwiki-platform-repository-test-tests/pom.xml       |  2 +-
 .../xwiki-platform-repository-test-utils/pom.xml       |  2 +-
 xwiki-platform-core/xwiki-platform-resource/pom.xml    |  2 +-
 .../xwiki-platform-resource-api/pom.xml                |  2 +-
 .../xwiki-platform-resource-default/pom.xml            |  2 +-
 .../xwiki-platform-resource-servlet/pom.xml            |  2 +-
 .../xwiki-platform-resource-temporary/pom.xml          |  2 +-
 .../xwiki-platform-resource-test/pom.xml               |  2 +-
 .../xwiki-platform-resource-test-tests/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-rest/pom.xml        |  2 +-
 .../xwiki-platform-rest-api/pom.xml                    |  2 +-
 .../xwiki-platform-rest-model/pom.xml                  |  2 +-
 .../xwiki-platform-rest-server/pom.xml                 |  2 +-
 .../xwiki-platform-rest-test/pom.xml                   |  2 +-
 .../xwiki-platform-rest-test-tests/pom.xml             |  2 +-
 xwiki-platform-core/xwiki-platform-sandbox/pom.xml     |  2 +-
 xwiki-platform-core/xwiki-platform-scheduler/pom.xml   |  2 +-
 .../xwiki-platform-scheduler-api/pom.xml               |  2 +-
 .../xwiki-platform-scheduler-test/pom.xml              |  2 +-
 .../xwiki-platform-scheduler-test-docker/pom.xml       |  2 +-
 .../xwiki-platform-scheduler-test-pageobjects/pom.xml  |  2 +-
 .../xwiki-platform-scheduler-ui/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-search/pom.xml      |  2 +-
 .../xwiki-platform-search-api/pom.xml                  |  2 +-
 .../xwiki-platform-search-solr/pom.xml                 |  2 +-
 .../xwiki-platform-search-solr-api/pom.xml             |  2 +-
 .../xwiki-platform-search-solr-query/pom.xml           |  2 +-
 .../xwiki-platform-search-solr-rest/pom.xml            |  2 +-
 .../xwiki-platform-search-solr-server/pom.xml          |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-search-solr-server-core/pom.xml     |  2 +-
 .../xwiki-platform-search-solr-server-plugin/pom.xml   |  2 +-
 .../xwiki-platform-search-solr-test/pom.xml            |  2 +-
 .../xwiki-platform-search-solr-test-docker/pom.xml     |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-search-solr-test-utils/pom.xml      |  2 +-
 .../xwiki-platform-search-solr-ui/pom.xml              |  2 +-
 .../xwiki-platform-search-ui/pom.xml                   |  2 +-
 xwiki-platform-core/xwiki-platform-security/pom.xml    |  2 +-
 .../xwiki-platform-security-api/pom.xml                |  2 +-
 .../xwiki-platform-security-authentication/pom.xml     |  2 +-
 .../xwiki-platform-security-authentication-api/pom.xml |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-security-authentication-ui/pom.xml  |  2 +-
 .../xwiki-platform-security-authorization/pom.xml      |  2 +-
 .../xwiki-platform-security-authorization-api/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-security-requiredrights/pom.xml     |  2 +-
 .../xwiki-platform-security-requiredrights-api/pom.xml |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 xwiki-platform-core/xwiki-platform-sharepage/pom.xml   |  2 +-
 .../xwiki-platform-sharepage-api/pom.xml               |  2 +-
 .../xwiki-platform-sharepage-test/pom.xml              |  2 +-
 .../xwiki-platform-sharepage-test-docker/pom.xml       |  2 +-
 .../xwiki-platform-sharepage-test-pageobjects/pom.xml  |  2 +-
 .../xwiki-platform-sharepage-ui/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-sheet/pom.xml       |  2 +-
 .../xwiki-platform-sheet-api/pom.xml                   |  2 +-
 .../xwiki-platform-sheet-ui/pom.xml                    |  2 +-
 xwiki-platform-core/xwiki-platform-skin/pom.xml        |  2 +-
 .../xwiki-platform-skin-api/pom.xml                    |  2 +-
 .../xwiki-platform-skin-skinx/pom.xml                  |  2 +-
 .../xwiki-platform-skin-test/pom.xml                   |  2 +-
 .../xwiki-platform-skin-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-skin-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-statistics/pom.xml  |  2 +-
 .../xwiki-platform-statistics-ui/pom.xml               |  2 +-
 xwiki-platform-core/xwiki-platform-store/pom.xml       |  2 +-
 .../xwiki-platform-store-api/pom.xml                   |  2 +-
 .../xwiki-platform-store-filesystem-oldcore/pom.xml    |  2 +-
 .../xwiki-platform-store-filesystem/pom.xml            |  2 +-
 .../xwiki-platform-store-locks/pom.xml                 |  2 +-
 .../xwiki-platform-store-merge/pom.xml                 |  2 +-
 .../xwiki-platform-store-merge-api/pom.xml             |  2 +-
 .../xwiki-platform-store-merge-default/pom.xml         |  2 +-
 .../xwiki-platform-store-serialization/pom.xml         |  2 +-
 .../xwiki-platform-store-transaction/pom.xml           |  2 +-
 xwiki-platform-core/xwiki-platform-tag/pom.xml         |  2 +-
 .../xwiki-platform-tag/xwiki-platform-tag-api/pom.xml  |  2 +-
 .../xwiki-platform-tag/xwiki-platform-tag-test/pom.xml |  2 +-
 .../xwiki-platform-tag-test-docker/pom.xml             |  2 +-
 .../xwiki-platform-tag-test-pageobjects/pom.xml        |  2 +-
 .../xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml   |  2 +-
 xwiki-platform-core/xwiki-platform-template/pom.xml    |  2 +-
 .../xwiki-platform-template-api/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-test/pom.xml        |  2 +-
 .../xwiki-platform-test-checker/pom.xml                |  2 +-
 .../xwiki-platform-test-docker/pom.xml                 |  2 +-
 .../xwiki-platform-test-integration/pom.xml            |  2 +-
 .../xwiki-platform-test-oldcore/pom.xml                |  2 +-
 .../xwiki-platform-test-page/pom.xml                   |  2 +-
 .../xwiki-platform-test-rest/pom.xml                   |  2 +-
 .../xwiki-platform-test/xwiki-platform-test-ui/pom.xml |  2 +-
 .../xwiki-platform-test-upgrade/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-tika/pom.xml        |  2 +-
 .../xwiki-platform-tika-detect/pom.xml                 |  2 +-
 .../xwiki-platform-tika-parsers/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-tour/pom.xml        |  2 +-
 .../xwiki-platform-tour-test/pom.xml                   |  2 +-
 .../xwiki-platform-tour-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-tour-test-tests/pom.xml             |  2 +-
 .../xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml |  2 +-
 xwiki-platform-core/xwiki-platform-tree/pom.xml        |  2 +-
 .../xwiki-platform-tree-api/pom.xml                    |  2 +-
 .../xwiki-platform-tree-macro/pom.xml                  |  2 +-
 .../xwiki-platform-tree-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-tree-war/pom.xml                    |  2 +-
 .../xwiki-platform-tree-webjar/pom.xml                 |  2 +-
 xwiki-platform-core/xwiki-platform-uiextension/pom.xml |  2 +-
 .../xwiki-platform-uiextension-api/pom.xml             |  2 +-
 .../xwiki-platform-uiextension-test/pom.xml            |  2 +-
 .../xwiki-platform-uiextension-ui/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-url/pom.xml         |  2 +-
 .../xwiki-platform-url/xwiki-platform-url-api/pom.xml  |  2 +-
 .../xwiki-platform-url-container/pom.xml               |  2 +-
 .../xwiki-platform-url-default/pom.xml                 |  2 +-
 .../xwiki-platform-url-schemes/pom.xml                 |  2 +-
 .../xwiki-platform-url-scheme-filesystem/pom.xml       |  2 +-
 .../xwiki-platform-url-scheme-reference/pom.xml        |  2 +-
 .../xwiki-platform-url-scheme-standard/pom.xml         |  2 +-
 xwiki-platform-core/xwiki-platform-user/pom.xml        |  2 +-
 .../xwiki-platform-user-api/pom.xml                    |  2 +-
 .../xwiki-platform-user-default/pom.xml                |  2 +-
 .../xwiki-platform-user-directory/pom.xml              |  2 +-
 .../xwiki-platform-user-directory-test/pom.xml         |  2 +-
 .../xwiki-platform-user-directory-test-docker/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-user-directory-ui/pom.xml           |  2 +-
 .../xwiki-platform-user-profile/pom.xml                |  2 +-
 .../xwiki-platform-user-profile-test/pom.xml           |  2 +-
 .../xwiki-platform-user-profile-test-docker/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-user-profile-ui/pom.xml             |  2 +-
 .../xwiki-platform-user-resource/pom.xml               |  2 +-
 .../xwiki-platform-user-script/pom.xml                 |  2 +-
 .../xwiki-platform-user-test/pom.xml                   |  2 +-
 .../xwiki-platform-user-test-docker/pom.xml            |  2 +-
 xwiki-platform-core/xwiki-platform-velocity/pom.xml    |  2 +-
 .../xwiki-platform-velocity-webapp/pom.xml             |  2 +-
 .../xwiki-platform-velocity-xwiki/pom.xml              |  2 +-
 xwiki-platform-core/xwiki-platform-vfs/pom.xml         |  2 +-
 .../xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml  |  2 +-
 .../xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml |  2 +-
 .../xwiki-platform-vfs-test-docker/pom.xml             |  2 +-
 .../xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml   |  2 +-
 xwiki-platform-core/xwiki-platform-web/pom.xml         |  2 +-
 .../xwiki-platform-web-templates/pom.xml               |  2 +-
 .../xwiki-platform-web/xwiki-platform-web-war/pom.xml  |  2 +-
 xwiki-platform-core/xwiki-platform-webjars/pom.xml     |  2 +-
 .../xwiki-platform-webjars-api/pom.xml                 |  2 +-
 .../xwiki-platform-webjars-test/pom.xml                |  2 +-
 .../xwiki-platform-webjars-test-tests/pom.xml          |  2 +-
 xwiki-platform-core/xwiki-platform-websocket/pom.xml   |  2 +-
 xwiki-platform-core/xwiki-platform-whatsnew/pom.xml    |  2 +-
 .../xwiki-platform-whatsnew-api/pom.xml                |  2 +-
 .../xwiki-platform-whatsnew-test/pom.xml               |  2 +-
 .../xwiki-platform-whatsnew-test-docker/pom.xml        |  2 +-
 .../xwiki-platform-whatsnew-test-pageobjects/pom.xml   |  2 +-
 .../xwiki-platform-whatsnew-ui/pom.xml                 |  2 +-
 xwiki-platform-core/xwiki-platform-wiki/pom.xml        |  2 +-
 .../xwiki-platform-wiki-api/pom.xml                    |  2 +-
 .../xwiki-platform-wiki-creationjob/pom.xml            |  2 +-
 .../xwiki-platform-wiki-default/pom.xml                |  2 +-
 .../xwiki-platform-wiki-rest/pom.xml                   |  2 +-
 .../xwiki-platform-wiki-rest-api/pom.xml               |  2 +-
 .../xwiki-platform-wiki-rest-default/pom.xml           |  2 +-
 .../xwiki-platform-wiki-script/pom.xml                 |  2 +-
 .../xwiki-platform-wiki-template/pom.xml               |  2 +-
 .../xwiki-platform-wiki-template-api/pom.xml           |  2 +-
 .../xwiki-platform-wiki-template-default/pom.xml       |  2 +-
 .../xwiki-platform-wiki-template-script/pom.xml        |  2 +-
 .../xwiki-platform-wiki-test/pom.xml                   |  2 +-
 .../xwiki-platform-wiki-test-docker/pom.xml            |  2 +-
 .../xwiki-platform-wiki-test-pageobjects/pom.xml       |  2 +-
 .../xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml |  2 +-
 .../xwiki-platform-wiki-ui-common/pom.xml              |  2 +-
 .../xwiki-platform-wiki-ui-mainwiki/pom.xml            |  2 +-
 .../xwiki-platform-wiki-ui-wiki/pom.xml                |  2 +-
 .../xwiki-platform-wiki-user/pom.xml                   |  2 +-
 .../xwiki-platform-wiki-user-api/pom.xml               |  2 +-
 .../xwiki-platform-wiki-user-default/pom.xml           |  2 +-
 .../xwiki-platform-wiki-user-script/pom.xml            |  2 +-
 .../xwiki-platform-wiki-workspaces-migrator/pom.xml    |  2 +-
 xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml     |  2 +-
 .../xwiki-platform-wysiwyg-api/pom.xml                 |  2 +-
 .../xwiki-platform-wysiwyg-ui/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-xar/pom.xml         |  2 +-
 .../xwiki-platform-xar-model/pom.xml                   |  2 +-
 .../xwiki-platform-xar-script/pom.xml                  |  2 +-
 xwiki-platform-core/xwiki-platform-xclass/pom.xml      |  2 +-
 .../xwiki-platform-xclass-test/pom.xml                 |  2 +-
 .../xwiki-platform-xclass-test-docker/pom.xml          |  2 +-
 .../xwiki-platform-xclass-test-pageobjects/pom.xml     |  2 +-
 .../xwiki-platform-xclass-ui/pom.xml                   |  2 +-
 xwiki-platform-core/xwiki-platform-xml/pom.xml         |  2 +-
 .../xwiki-platform-xml-script/pom.xml                  |  2 +-
 .../xwiki-platform-xml-security/pom.xml                |  2 +-
 xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml |  2 +-
 xwiki-platform-distribution/pom.xml                    | 10 +++++-----
 .../xwiki-platform-distribution-debian/pom.xml         |  4 ++--
 .../xwiki-platform-distribution-debian-common/pom.xml  |  4 ++--
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-debian-solr/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  4 ++--
 .../pom.xml                                            |  4 ++--
 .../pom.xml                                            |  4 ++--
 .../pom.xml                                            |  4 ++--
 .../xwiki-platform-distribution-debian-tomcat/pom.xml  |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-debian-xjetty/pom.xml  |  2 +-
 .../pom.xml                                            |  6 +++---
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-flavor/pom.xml         |  2 +-
 .../xwiki-platform-distribution-flavor-common/pom.xml  |  2 +-
 .../xwiki-platform-distribution-flavor-data/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-flavor-test/pom.xml    |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-flavor-test-ui/pom.xml |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-flavor-tour/pom.xml    |  2 +-
 .../xwiki-platform-distribution-flavor-wiki/pom.xml    |  2 +-
 .../xwiki-platform-distribution-flavor-xip/pom.xml     |  2 +-
 .../xwiki-platform-distribution-jetty-hsqldb/pom.xml   |  2 +-
 .../xwiki-platform-distribution-resources/pom.xml      |  2 +-
 .../xwiki-platform-distribution-ui/pom.xml             |  2 +-
 .../xwiki-platform-distribution-ui-admin-user/pom.xml  |  2 +-
 .../xwiki-platform-distribution-ui-base/pom.xml        |  2 +-
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 .../xwiki-platform-distribution-war/pom.xml            |  2 +-
 xwiki-platform-tools/pom.xml                           |  2 +-
 .../pom.xml                                            |  2 +-
 xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml |  2 +-
 .../xwiki-platform-tool-jetty-listener/pom.xml         |  2 +-
 .../xwiki-platform-tool-jetty-resources/pom.xml        |  2 +-
 .../xwiki-platform-tool-packager-plugin/pom.xml        |  2 +-
 .../xwiki-platform-tool-provision-plugin/pom.xml       |  2 +-
 .../xwiki-platform-tool-rootwebapp/pom.xml             |  2 +-
 .../xwiki-platform-tool-standards-validator/pom.xml    |  2 +-
 .../xwiki-platform-tool-xmldoc-update-plugin/pom.xml   |  2 +-
 765 files changed, 780 insertions(+), 780 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f39012fc304..97e55565620c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
   <artifactId>xwiki-platform</artifactId>
   <name>XWiki Platform - Parent POM</name>
   <packaging>pom</packaging>
-  <version>16.0.0-SNAPSHOT</version>
+  <version>16.1.0-SNAPSHOT</version>
   <description>XWiki Platform - Parent POM</description>
   <properties>
     <!-- Useful for external Maven projects that extend the Platform POM. Must not be used by Platform project! -->
@@ -124,7 +124,7 @@
     <connection>scm:git:git://github.com/xwiki/xwiki-platform.git</connection>
     <developerConnection>scm:git:git@github.com:xwiki/xwiki-platform.git</developerConnection>
     <url>https://github.com/xwiki/xwiki-platform/tree/master/</url>
-    <tag>stable-16.0.x</tag>
+    <tag>stable-12.7.x</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
diff --git a/xwiki-platform-core/pom.xml b/xwiki-platform-core/pom.xml
index 28daadf9a0b4..e1832293e0f7 100644
--- a/xwiki-platform-core/pom.xml
+++ b/xwiki-platform-core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-core</artifactId>
   <name>XWiki Platform - Core - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
index 92f343f9f3d8..1297fdd63f05 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2</artifactId>
   <name>XWiki Platform - Active Installs 2 - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
index d469f17104a9..12ec727b7437 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-api</artifactId>
   <name>XWiki Platform - Active Installs 2 - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
index 35fec467e104..a44699ab3b6d 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
   <name>XWiki Platform - Active Installs 2 - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
index 19a0324d0ec0..6734b31a10ab 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-test-docker</artifactId>
   <name>XWiki Platform - Active Installs 2 - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/pom.xml b/xwiki-platform-core/xwiki-platform-administration/pom.xml
index fd03415f808f..9d3e87aaa64f 100644
--- a/xwiki-platform-core/xwiki-platform-administration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration</artifactId>
   <name>XWiki Platform - Administration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
index e1902a4306b6..a8bd29723919 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test</artifactId>
   <name>XWiki Platform - Administration - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
index 3e3efda2b8c0..8c7177736c03 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test-docker</artifactId>
   <name>XWiki Platform - Administration - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
index 2f5feeaa4a4b..8397f1b268b8 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test-pageobjects</artifactId>
   <name>XWiki Platform - Administration - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
index da4e2d0a1461..b72c1b1e47e1 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-ui</artifactId>
   <name>XWiki Platform - Administration - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-alerts/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/pom.xml
index 4b29d3a7579a..e800226c2e30 100644
--- a/xwiki-platform-core/xwiki-platform-alerts/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/pom.xml
@@ -25,10 +25,10 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-alerts</artifactId>
-  <version>16.0.0-SNAPSHOT</version>
+  <version>16.1.0-SNAPSHOT</version>
   <name>XWiki Platform - Alerts - Parent POM</name>
   <packaging>pom</packaging>
   <description>Application that adds an "alert" menu in the skin.</description>
diff --git a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
index 2e4fb1f2eda1..16f702428745 100644
--- a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
@@ -25,10 +25,10 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-alerts</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-alerts-ui</artifactId>
-  <version>16.0.0-SNAPSHOT</version>
+  <version>16.1.0-SNAPSHOT</version>
   <name>XWiki Platform - Alerts - UI</name>
   <packaging>xar</packaging>
   <properties>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/pom.xml
index 4ca7396a7adc..e98344bb854b 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation</artifactId>
   <name>XWiki Platform - Annotations - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
index 31a1f754d06b..088b495acbd2 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-core</artifactId>
   <name>XWiki Platform - Annotations - Core Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
index be489ffa40ff..e755aebd69f0 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-io</artifactId>
   <name>XWiki Platform - Annotations - XWiki Storage Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
index ebc611ea5bfd..20fb07ea354e 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-maintainer</artifactId>
   <name>XWiki Platform - Annotations - Maintainer</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
index 9097b691d37e..8603200b2d49 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-reference</artifactId>
   <name>XWiki Platform - Annotations - References Manipulation</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
index 555261ba27aa..8aecc2235cd4 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-rest</artifactId>
   <name>XWiki Platform - Annotations - REST Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
index a5d64bb400c2..7940b05044d3 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-scripting</artifactId>
   <name>XWiki Platform - Annotations - Scripting APIs</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
index aa0dc74af100..271c887380f7 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test</artifactId>
   <name>XWiki Platform - Annotations - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
index ec8980106e2d..cbe0ab37f592 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test-docker</artifactId>
   <name>XWiki Platform - Annotation - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
index 1525ca8905ab..dd9ac82424ec 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test-pageobjects</artifactId>
   <name>XWiki Platform - Annotations - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
index 228db37daaa7..ab5cac75e85f 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-ui</artifactId>
   <name>XWiki Platform - Annotations - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/pom.xml b/xwiki-platform-core/xwiki-platform-application/pom.xml
index 9119e828481b..ed124517df10 100644
--- a/xwiki-platform-core/xwiki-platform-application/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application</artifactId>
   <name>XWiki Platform - Application - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
index e2d15fb0386c..0ad9cd101f85 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-test</artifactId>
   <name>XWiki Platform - Application - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
index d07c2d95b8bd..a014ce70677c 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-test-pageobjects</artifactId>
   <name>XWiki Platform - Application - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
index d5bb13672726..0cd6aeccd445 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-ui</artifactId>
   <name>XWiki Platform - Application - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
index a784e05c0c2f..0a57dd2bc107 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes</artifactId>
   <name>XWiki Platform - App Within Minutes</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
index 1db8279ea7a5..a62bf31b3a73 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
   <name>XWiki Platform - App Within Minutes - Test - Parent</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
index 98b38bf5c0c7..50364c8a1cfa 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test-docker</artifactId>
   <name>XWiki Platform - AppWithinMinutes - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
index 3074ef9a9de0..fec9a5633271 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test-pageobjects</artifactId>
   <name>XWiki Platform - App Within Minutes - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
index 275ab2250437..a64a5a726854 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-ui</artifactId>
   <name>XWiki Platform - App Within Minutes - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/pom.xml
index 05ff35d4fe6a..c5c2b8aeffe3 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment</artifactId>
   <name>XWiki Platform - Attachment - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
index bb7194abf186..7facc08ab7e5 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-api</artifactId>
   <name>XWiki Platform - Attachment - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
index 16d70adead07..ba90fc21e332 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker</artifactId>
   <name>XWiki Platform - Attachment - Picker - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
index 6e21512deac7..ac2bf7db5188 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-attachment-picker-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
index 7f3dfd641bf8..fe1d757be4f4 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
index 60698ea2bdbe..6d64147f6f86 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
index 30e1c328106f..15daea9364d7 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
index 88a7a0163756..8d95bd7559ce 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-ui</artifactId>
   <name>XWiki Platform - Attachment - Picker - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
index 0bf0292237d4..500aa6b1ad59 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-attachment-picker-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
index 8f4feaaee529..5034b4edbe5c 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test</artifactId>
   <name>XWiki Platform - Attachment - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
index 57c1ad60d8db..10c402a8b2fc 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
index 28ae6d5cff52..e86ff137eff9 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
index 2f21c36a6745..fa3df41180b2 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-ui</artifactId>
   <name>XWiki Platform - Attachment - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
index fb96cfb9a096..b405eea34757 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation</artifactId>
   <name>XWiki Platform - Attachment - Validation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
index e1eb45a54905..2daf1484667f 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-api</artifactId>
   <name>XWiki Platform - Attachment - Validation - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
index f2376926da2e..06b871d3f5dc 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-default</artifactId>
   <name>XWiki Platform - Attachment - Validation - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
index edba333dd615..345928ac5ad6 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
index 281e008c4656..20576d9c2e73 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
index 3e786e4d9f06..f0d8153e2b4e 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
index eb7625225776..99d128742234 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-ui</artifactId>
   <name>XWiki Platform - Attachment - Validation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-bridge/pom.xml b/xwiki-platform-core/xwiki-platform-bridge/pom.xml
index 1ec0a5097834..fcbcfb259f8d 100644
--- a/xwiki-platform-core/xwiki-platform-bridge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-bridge/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-bridge</artifactId>
   <name>XWiki Platform - Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/pom.xml
index 14c0b04d743b..5dbfc0572262 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha</artifactId>
   <name>XWiki Platform - CAPTCHA - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
index b6f3289b26b1..8c5df9a7f529 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-api</artifactId>
   <name>XWiki Platform - CAPTCHA - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
index a119789e90b0..38159faa5518 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-default</artifactId>
   <name>XWiki Platform - CAPTCHA - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
index 9b11961e1355..4c0769b85bce 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
   <name>XWiki Platform - CAPTCHA - JCaptcha - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
index 61cbf6f2ddcb..4c9d0d83202e 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha-api</artifactId>
   <name>XWiki Platform - CAPTCHA - JCaptcha - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
index 8df6728f70f0..e551ef751aa0 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
index b1f817956019..db00c335066c 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-captcha-jcaptcha-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
index 4fd901ca1f18..b470ddb7a362 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-chart/pom.xml b/xwiki-platform-core/xwiki-platform-chart/pom.xml
index b659d46b941a..dc5648fa7d25 100644
--- a/xwiki-platform-core/xwiki-platform-chart/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-chart</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
index 2b8bcdd39ca2..3cad312a9878 100644
--- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
     <relativePath>../../xwiki-platform-rendering/xwiki-platform-rendering-macros</relativePath>
   </parent>
   <artifactId>xwiki-platform-chart-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
index fe6cb42e8f72..a221701a067c 100644
--- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-chart</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-chart-renderer</artifactId>
   <name>XWiki Platform - Chart - Rendering</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
index af01402e264a..7c9c43b2dfce 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
index 83419c6a495f..48e2a93d613d 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-ckeditor-plugins</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
index 02b1774c7d9c..3c89ee513a78 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
index 95056ec928d9..7addaecf0df2 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test-docker</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
index d2a687d8b5ef..eb43ab36b56b 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test-pageobjects</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
index 2cf396bf8fc3..d88d1dde0c85 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-ui</artifactId>
   <name>XWiki Platform - CKEditor - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
index dfaa646ce0f8..16929b2b7370 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-ckeditor-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/pom.xml
index dd6e166357fb..07c0770bf727 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader</artifactId>
   <name>XWiki Platform - ClassLoader - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
index a77bc2aeda0c..c81bdf7c5d9a 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-protocols</artifactId>
   <name>XWiki Platform - ClassLoader - Protocols - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
index 6f80c943305f..57f529e455ed 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader-protocols</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-protocol-attachmentjar</artifactId>
   <name>XWiki Platform - ClassLoader - Protocols - Attachment JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
index 9fc863ea7b8f..27e5f6ed8752 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-xwiki</artifactId>
   <name>XWiki Platform - Classloader - XWiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/pom.xml b/xwiki-platform-core/xwiki-platform-component/pom.xml
index eba44a097111..abe99a3aa676 100644
--- a/xwiki-platform-core/xwiki-platform-component/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component</artifactId>
   <name>XWiki Platform - Component - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
index 8b682da06d8b..afbb0efb8c26 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-multi</artifactId>
   <name>XWiki Platform - Component - Multi</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
index 25c41622cdd4..c1d7dc09aa16 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-script</artifactId>
   <name>XWiki Platform - Component - Script Service</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
index 5ef6f19d2c7f..f1d67d8f9e58 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-wiki</artifactId>
   <name>XWiki Platform - Component - Wiki Components</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/pom.xml
index d81db9d16656..d019cade9e6d 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration</artifactId>
   <name>XWiki Platform - Configuration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
index 4b62cff7b143..948742438f7d 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-configuration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration-api</artifactId>
   <name>XWiki Platform - Configuration - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
index fae36a242dc2..b216c12d68a5 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-configuration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration-default</artifactId>
   <name>XWiki Platform - Configuration - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/pom.xml b/xwiki-platform-core/xwiki-platform-container/pom.xml
index 05620c73a7cf..6d8c73586fed 100644
--- a/xwiki-platform-core/xwiki-platform-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container</artifactId>
   <name>XWiki Platform - Containers - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
index d8ad35ea0d4c..3684676ebc7c 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-api</artifactId>
   <name>XWiki Platform - Containers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
index 6c88b8cf7b13..0f68531ebed1 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-portlet</artifactId>
   <name>XWiki Platform - Containers - Portlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
index 5067f01f75c9..6a1b5495101d 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-servlet</artifactId>
   <name>XWiki Platform - Containers - Servlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/pom.xml
index 656725db1591..06848443e8b5 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-crypto</artifactId>
   <name>XWiki Platform - Cryptographic Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
index 7005d92ef6b2..29795ecc5173 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
index e8c0bd7e459f..43a3b8860cfe 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-store</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
index f7f3c2e8a49b..ff70e3b1dcff 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto-store</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-store-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
index c1b9adc49319..5a2b082d7117 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-crypto-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-crypto-store-wiki</artifactId>
   <name>XWiki Platform - Cryptographic Services - Storage - Wiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-csrf/pom.xml b/xwiki-platform-core/xwiki-platform-csrf/pom.xml
index 2853b1ec7641..6fce33da0f12 100644
--- a/xwiki-platform-core/xwiki-platform-csrf/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-csrf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-csrf</artifactId>
   <name>XWiki Platform - CSRF</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
index 8400d281f13d..0f8e34054a9d 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard</artifactId>
   <name>XWiki Platform - Dashboard - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
index a44b2f242519..0858332559f7 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-macro</artifactId>
   <name>XWiki Platform - Dashboard - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
index 30251e3a773b..afbaaf54bb92 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test</artifactId>
   <name>XWiki Platform - Dashboard - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
index 8fe36066c15e..8798a3713def 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test-docker</artifactId>
   <name>XWiki Platform - Dashboard - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
index efc6ae061d2c..ffd054733a20 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test-pageobjects</artifactId>
   <name>XWiki Platform - Dashboard - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
index cca0141a89bb..0a5720093b24 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-ui</artifactId>
   <name>XWiki Platform - Dashboard - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-date/pom.xml b/xwiki-platform-core/xwiki-platform-date/pom.xml
index 7bda35b26144..df21389e3533 100644
--- a/xwiki-platform-core/xwiki-platform-date/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-date/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-date</artifactId>
   <name>XWiki Platform - Date</name>
diff --git a/xwiki-platform-core/xwiki-platform-diff/pom.xml b/xwiki-platform-core/xwiki-platform-diff/pom.xml
index d65ae26e4059..05d296327aa7 100644
--- a/xwiki-platform-core/xwiki-platform-diff/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-diff/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-diff</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml b/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
index 4d82e6d0d2ca..9a59af4c9539 100644
--- a/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-diff</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-diff-xml</artifactId>
   <name>XWiki Platform - Diff - XML</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/pom.xml b/xwiki-platform-core/xwiki-platform-display/pom.xml
index d5ab2da865ce..98d2f7a92a97 100644
--- a/xwiki-platform-core/xwiki-platform-display/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display</artifactId>
   <name>XWiki Platform - Display</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
index 0e62aeca7936..98d819f2fd3e 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-api</artifactId>
   <name>XWiki Platform - Display - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
index 581c109691cf..9ef761d3d033 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-html</artifactId>
   <name>XWiki Platform - Display - HTML</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
index d23b9141a315..f2d3f75820e2 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-macro</artifactId>
   <name>XWiki Platform - Display - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/pom.xml b/xwiki-platform-core/xwiki-platform-edit/pom.xml
index 5948c3ed0d71..30932fcfcf42 100644
--- a/xwiki-platform-core/xwiki-platform-edit/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit</artifactId>
   <name>XWiki Platform - Edit</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
index 4aef3083ec58..d6b0884799b5 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-api</artifactId>
   <name>XWiki Platform - Edit - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
index c2c694df9b70..dec90bc5afb0 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-default</artifactId>
   <name>XWiki Platform - Edit - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
index 4d8f5291c682..20113ee72fb8 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test</artifactId>
   <name>XWiki Platform - Edit - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
index 9826af4aed6d..c86313627d26 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test-docker</artifactId>
   <name>XWiki Platform - Edit - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
index ba627b64365f..81272180981e 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test-pageobjects</artifactId>
   <name>XWiki Platform - Edit - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
index bd45f6279f81..220680a74e97 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-ui</artifactId>
   <name>XWiki Platform - Edit - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
index bb68c4474cb3..8788a5d16763 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream</artifactId>
   <name>XWiki Platform - Event Stream - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
index 2fd1f85db6ba..424fdcc46299 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-api</artifactId>
   <name>XWiki Platform - Event Stream - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
index 2976ecb3130f..ae2f3ff0dd94 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-default</artifactId>
   <name>XWiki Platform - Event Stream - Default Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
index 9579422fda59..be056295c13b 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-stores</artifactId>
   <name>XWiki Platform - Event Stream - Stores</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
index f590a7c49543..c7ac2ecc2398 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream-stores</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-store-common</artifactId>
   <name>XWiki Platform - Event Stream - Store - Common</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
index e591b6bcd769..773e3b9688e9 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream-stores</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-store-solr</artifactId>
   <name>XWiki Platform - Event Stream - Store - Solr</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/pom.xml b/xwiki-platform-core/xwiki-platform-export/pom.xml
index 66e79fd59822..5445eb0a191b 100644
--- a/xwiki-platform-core/xwiki-platform-export/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export</artifactId>
   <name>XWiki Platform - Export</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
index 61c8c7fcfee7..0b49da57a814 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-api</artifactId>
   <name>XWiki Platform - Export - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
index 4d3b8c936bdf..33fb84dbbec6 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf</artifactId>
   <name>XWiki Platform - Export - PDF</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
index d93c4862c39d..1dc4899589fd 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-api</artifactId>
   <name>XWiki Platform - Export - PDF - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
index 5407579e957c..80153317d79d 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-default</artifactId>
   <name>XWiki Platform - Export - PDF - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
index b54b33f580e8..7f17742f74a1 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
index 966178ca0172..03045fcce70f 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-content</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Content</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
index 6486ed2bc362..45ac8df77bfb 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-docker</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
index 3233f59c56b6..27e82cc60bd4 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-pageobjects</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
index d9ee180bb79f..b53bc7b7737f 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-ui</artifactId>
   <name>XWiki Platform - Export - PDF - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/pom.xml b/xwiki-platform-core/xwiki-platform-extension/pom.xml
index 1c26037b3a93..af149d270274 100644
--- a/xwiki-platform-core/xwiki-platform-extension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension</artifactId>
   <name>XWiki Platform - Extension - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
index 54be34ee0a64..92c3cc0a0e45 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-api</artifactId>
   <name>XWiki Platform - Extension - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
index bf218121d892..273f71ebacf9 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-cluster</artifactId>
   <name>XWiki Platform - Extension - Cluster</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
index 6be8f4acd286..3a60c5d3fb2f 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-distribution</artifactId>
   <name>XWiki Platform - Extension - Distribution</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
index 489a9ceaf666..feaf8b73ae3b 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handlers</artifactId>
   <name>XWiki Platform - Extension - Handler - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
index 58ac9a809bc4..2184e0c826c5 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-handlers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handler-jar</artifactId>
   <name>XWiki Platform - Extension - Handler - JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
index 6a449e3d65bd..5b1527d497e7 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-handlers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handler-xar</artifactId>
   <name>XWiki Platform - Extension - Handler - XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
index 64e3941030a4..6730897e9319 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-index</artifactId>
   <name>XWiki Platform - Extension - Index</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
index 01ac41306f4e..c5525255d0e1 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-script</artifactId>
   <name>XWiki Platform - Extension - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
index a7b35b940f2b..d99805b38333 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security</artifactId>
   <name>XWiki Platform - Extension - Security - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
index 200a5ada33bb..11d6e0f8bc3d 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-api</artifactId>
   <name>XWiki Platform - Extension - Security - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
index c5918e27bf6e..b7e9e9791213 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-index</artifactId>
   <name>XWiki Platform - Extension - Security - Index</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
index 0d4e9735737f..3977705154d5 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-notifications</artifactId>
   <name>XWiki Platform - Extension - Security - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
index bacfc7444299..e29bc8fd9014 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-test</artifactId>
   <name>XWiki Platform - Extension - Security - Test - Root POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
index 8cbfe01d8707..006a1db3e1fb 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Extension - Security - Test - Functional Docker Tests</name>
   <artifactId>xwiki-platform-extension-security-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
index 6fb3dd913c5a..e12574e97360 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-test-pageobjects</artifactId>
   <name>XWiki Platform - Extension - Security - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
index 7fa4cf8e9693..5b2c06d9b150 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-ui</artifactId>
   <name>XWiki Platform - Extension - Security - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
index 56ed880635cc..7ef8d6c8d294 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test</artifactId>
   <name>XWiki Platform - Extension - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
index 9c3262c28d65..272121a5aef2 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-pageobjects</artifactId>
   <name>XWiki Platform - Extension - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
index a310c9364273..82401b8b5d66 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-tests</artifactId>
   <name>XWiki Platform - Extension - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
index 90d0df34a961..00ed51f0fb18 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-utils</artifactId>
   <name>XWiki Platform - Extension - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
index 3df4ca28bf37..202c7147aa07 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-ui</artifactId>
   <name>XWiki Platform - Extension - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
index 2226ca95c1ab..594c3d2d0ab2 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-extension</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>xwiki-platform-extension-versioncheck</artifactId>
     <name>XWiki Platform - Extension - Version Check</name>
diff --git a/xwiki-platform-core/xwiki-platform-feed/pom.xml b/xwiki-platform-core/xwiki-platform-feed/pom.xml
index 01330cab444b..d4f653ca4832 100644
--- a/xwiki-platform-core/xwiki-platform-feed/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-feed/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-feed</artifactId>
   <name>XWiki Platform - Feed - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml b/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
index 774b5d591f70..042be955b600 100644
--- a/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-feed</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-feed-api</artifactId>
   <name>XWiki Platform - Feed - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/pom.xml b/xwiki-platform-core/xwiki-platform-filter/pom.xml
index 1fa54963e2c1..f0f3d7a6a578 100644
--- a/xwiki-platform-core/xwiki-platform-filter/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
index 76c7d42e797f..51b0d4633612 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-events</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
index 21a94f60c140..0136829080db 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-model</artifactId>
   <name>XWiki Platform - Filter - Event - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
index 5b5b2be0ab5d..223b3fe9d7c8 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-user</artifactId>
   <name>XWiki Platform - Filter - Event - User</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
index 6cde2417d7c7..ece500a676a7 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-xwiki</artifactId>
   <name>XWiki Platform - Filter - Event - XWiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
index 0c3a0de013ce..178876b2200c 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
index dc8b5f2e6319..e7b45f7709fc 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-api</artifactId>
   <name>XWiki Platform - Filter - Instance - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
index 65c13c8e3e36..099ecb690f1b 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-document</artifactId>
   <name>XWiki Platform - Filter - Instance - Document</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
index cce5ffd096af..991ccb754ae4 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-extension</artifactId>
   <name>XWiki Platform - Filter - Instance - Extension</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
index 430e775a0471..7894ceebcc91 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-script</artifactId>
   <name>XWiki Platform - Filter - Instance - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
index 860a146f5c7e..85993e2cf3c1 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-script</artifactId>
   <name>XWiki Platform - Filter - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
index b4a0a7a8ff33..0b057e4e0f99 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-streams</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
index 5defab3a6183..d5d6b322eba5 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-streams</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-stream-xar</artifactId>
   <name>XWiki Platform - Filter - XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
index f0d6bda7d730..b803353b6f97 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-test</artifactId>
   <name>XWiki Platform - Filter - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
index c29706dd1fbf..9f600c64a9a2 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-test-tests</artifactId>
   <name>XWiki Platform - Filter - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
index e30fdb9af18c..1b25bca876f5 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-ui</artifactId>
   <name>XWiki Platform - Filter - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
index 6c3c678fe165..264568c97e08 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo</artifactId>
   <name>XWiki Platform - Flamingo - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
index 9bced2c59efd..85d56f94a56d 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
index b90cf906fd25..d639718ec26b 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-resources</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Resources</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
index eb045e0bce61..4e10f6455816 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
index 9e67c14483f1..784c72ee2440 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test-docker</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
index c95d9c9d75cb..e811ef734814 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
index 8cc6299c8f99..6f5f283c3c28 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test-tests</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
index 6caff97114f7..166699b23d35 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
index fdb452aa9da2..bec18a6c216a 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-bootswatch</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
index 63c5e3663b7f..12b4addadf5c 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
index 54db24403919..3bc9918cc093 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test-docker</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Tests  - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
index 952d8a1430de..3a82835eca87 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test-pageobjects</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
index 8d1c5fa80878..e42223854230 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flavor/pom.xml b/xwiki-platform-core/xwiki-platform-flavor/pom.xml
index 85251b9d77e3..ee0280fd8b95 100644
--- a/xwiki-platform-core/xwiki-platform-flavor/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flavor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flavor</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml b/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
index 917571ad1047..c3d817010853 100644
--- a/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flavor-api</artifactId>
   <name>XWiki Platform - Flavor - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-groovy/pom.xml b/xwiki-platform-core/xwiki-platform-groovy/pom.xml
index 9c07585d8de0..847b23b3c3db 100644
--- a/xwiki-platform-core/xwiki-platform-groovy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-groovy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-groovy</artifactId>
   <name>XWiki Platform - Groovy</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/pom.xml b/xwiki-platform-core/xwiki-platform-help/pom.xml
index 2364b03c2d66..73b9cd5207ef 100644
--- a/xwiki-platform-core/xwiki-platform-help/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help</artifactId>
   <name>XWiki Platform - Help - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
index d08abee892db..2ad4f95c91c4 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-help</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help-test</artifactId>
   <name>XWiki Platform - Panels - Help - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
index a307a04b6845..6af01ac20d95 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-help-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-help-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
index f6ca2a53674c..4a78ec040809 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-help</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help-ui</artifactId>
   <name>XWiki Platform - Help - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/pom.xml b/xwiki-platform-core/xwiki-platform-icon/pom.xml
index baa5828e3a17..dcfe4747b814 100644
--- a/xwiki-platform-core/xwiki-platform-icon/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon</artifactId>
   <name>XWiki Platform - Icon - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
index 9a5b3aa0cf17..d10cb9298a4d 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-api</artifactId>
   <name>XWiki Platform - Icon - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
index 15dca18ad95b..7f560d5e3c61 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-default</artifactId>
   <name>XWiki Platform - Icon - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
index 2360c311145b..aa1d8a801278 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-icon</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-fontawesome</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
index 77340a7f8e7c..2549e58ea003 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-macro</artifactId>
   <name>XWiki Platform - Icon - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
index c2e8db09dfec..a8e553cdd562 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest</artifactId>
   <name>XWiki Platform - Icon - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
index 1d52b11bf294..298c7ceb6b41 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest-api</artifactId>
   <name>XWiki Platform - Icon - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
index ffec66b0f016..039967a50541 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest-default</artifactId>
   <name>XWiki Platform - Icon - REST - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
index 9873eda06e0d..d2b20a043033 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-script</artifactId>
   <name>XWiki Platform - Icon - Script services</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
index 8a0bff8c713d..a3e4125e1dac 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-test</artifactId>
   <name>XWiki Platform - Icon - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
index 221a22164fa5..920e955b91e2 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-test-docker</artifactId>
   <name>XWiki Platform - Icon - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
index 550f736e257f..b1f6f2e6d578 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-image/pom.xml b/xwiki-platform-core/xwiki-platform-image/pom.xml
index 0fa5c0e4acb2..1bf060a1f88c 100644
--- a/xwiki-platform-core/xwiki-platform-image/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image</artifactId>
   <name>XWiki Platform - Image - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
index 9d84d5a99fe5..caa66ff6e8a3 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox</artifactId>
   <name>XWiki Platform - Image - Lightbox - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
index 86887cd569f4..47bb08febea4 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
index 63372f24d886..dcdee0e7af91 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test-docker</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
index a93a38b5dd47..a82199f5d129 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test-pageobjects</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
index 2943de4aae5b..1ac03d1e8599 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-ui</artifactId>
   <name>XWiki Platform - Image - Lightbox - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
index fd69dd76ad1b..8fc852989b1f 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-image-lightbox-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
index 6e5e59a9213c..a6b10f7acb27 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing</artifactId>
   <name>XWiki Platform - Image - Processing - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
index ba8e4b57c9e8..386b85f372cd 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-processing</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing-api</artifactId>
   <name>XWiki Platform - Image - Processing - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
index 9e111adc4543..107e339e8f8f 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-processing</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing-plugin</artifactId>
   <name>XWiki Platform - Image - Processing - Plugin</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
index da73e04a2720..d57eadabcc53 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style</artifactId>
   <name>XWiki Platform - Image - Style - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
index 620c1686ea5b..56912b3a81b1 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-api</artifactId>
   <name>XWiki Platform - Image - Style - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
index 91fa3c73ddc5..ae5239f73f6b 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-model</artifactId>
   <name>XWiki Platform - Image - Style - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
index 6ab73163a8ad..f2dd4163d393 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-rest</artifactId>
   <name>XWiki Platform - Image - Style - Rest</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
index edeab70a6d23..ca8319f6bb90 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
index fdc5cc162276..5cc6a7748454 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test-docker</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
index 487267f6f056..a3e54531edc6 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test-pageobjects</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
index ab9c6e851360..49e4dc743100 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-ui</artifactId>
   <name>XWiki Platform - Image - Style - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/pom.xml b/xwiki-platform-core/xwiki-platform-index/pom.xml
index d5ac4547cc77..755435466ffd 100644
--- a/xwiki-platform-core/xwiki-platform-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index</artifactId>
   <name>XWiki Platform - Index - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
index d376ebac0b9b..0b114d1ac46c 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-api</artifactId>
   <name>XWiki Platform - Index - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
index 2e6ee1016caa..c1130f69eec2 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-default</artifactId>
   <name>XWiki Platform - Index - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
index 939b232ebffc..791570135eb9 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test</artifactId>
   <name>XWiki Platform - Index - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
index 52c613bafea8..5969c0ab7ccc 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-docker</artifactId>
   <name>XWiki Platform - Index - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
index a9e40d8e3c91..166e4a3a9392 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-pageobjects</artifactId>
   <name>XWiki Platform - Index - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
index 4a2eb886dcf0..abac096c8c02 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-tests</artifactId>
   <name>XWiki Platform - Index - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
index 1f5cc624f2e7..0eb4fcdfd434 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree</artifactId>
   <name>XWiki Platform - Index - Tree - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
index ce7733c73876..3c5de104e0ad 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-api</artifactId>
   <name>XWiki Platform - Index - Tree - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
index 520e31baa402..879c351186f8 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-macro</artifactId>
   <name>XWiki Platform - Index - Tree - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
index 782bfc563d77..5ff41ef4b1e0 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-test</artifactId>
   <name>XWiki Platform - Index - Tree - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
index 78a5272f22a3..6c3e01cc3c47 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-test-pageobjects</artifactId>
   <name>XWiki Platform - Index - Tree - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
index c1b8be56176c..6584f892969f 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-war</artifactId>
   <name>XWiki Platform - Index - Tree - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
index e5a6077786b4..276946723168 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-ui</artifactId>
   <name>XWiki Platform - Index - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-instance/pom.xml b/xwiki-platform-core/xwiki-platform-instance/pom.xml
index a10f1c143500..00070a539a88 100644
--- a/xwiki-platform-core/xwiki-platform-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-instance</artifactId>
   <name>XWiki Platform - Instance</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/pom.xml
index bb81bad8969c..2b874563ca28 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation</artifactId>
   <name>XWiki Platform - Invitation</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
index 5b2ae534e6b4..8d0668ef90c9 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test</artifactId>
   <name>XWiki Platform - Invitation - Test</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
index 3309f99bf97a..970b3dc799af 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test-docker</artifactId>
   <name>XWiki Platform - Invitation - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
index 205b7d64c006..31aad95f8e56 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test-pageobject</artifactId>
   <name>XWiki Platform - Invitation - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
index 5780319a2f1b..c5e879559dc3 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-ui</artifactId>
   <name>XWiki Platform - Invitation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/pom.xml b/xwiki-platform-core/xwiki-platform-job/pom.xml
index dc5870379238..841a5d2ba454 100644
--- a/xwiki-platform-core/xwiki-platform-job/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job</artifactId>
   <name>XWiki Platform - Job - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
index 7f2d70e0d882..a77c26768d04 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>xwiki-platform-job-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
index 7b330bb93181..9fd942a7dc3a 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job-handler</artifactId>
   <name>XWiki Platform - Job - Handler</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
index fa0a1744be98..1d3fd20d75ea 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job-script</artifactId>
   <name>XWiki Platform - Job - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
index 43636160632f..13da1642029d 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-job-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-jodatime/pom.xml b/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
index ba177b3585a5..64d137dc135a 100644
--- a/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-jodatime</artifactId>
   <name>XWiki Platform - Joda Time</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/pom.xml
index e54340d019e3..8359d564f772 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy</artifactId>
   <name>XWiki Platform - Legacy</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
index b5e10aef39f7..88b0743150f0 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-annotation</artifactId>
   <name>XWiki Platform - Legacy - Annotation</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
index 0965b0a51783..77ad9e2e09da 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
   <name>XWiki Platform - Legacy - Events Hibernate</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
index eab64bf5c29b..e18c65937087 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>xwiki-platform-legacy-events-hibernate-api</artifactId>
     <name>XWiki Platform - Legacy - Events Hibernate - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
index 5d867b5d16b0..afb750c8ed0c 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-events-hibernate-ui</artifactId>
   <name>XWiki Platform - Legacy - Events Hibernate - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
index bb1dea2cc26a..a6d13f91c5e7 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-extension-handler-xar</artifactId>
   <name>XWiki Platform - Legacy - Extension Handler XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
index 9c9e5874664e..fc48c6877636 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-instance</artifactId>
   <name>XWiki Platform - Legacy - Instance</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
index 406162c319ef..312fff3b8a6d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail</artifactId>
   <name>XWiki Platform - Legacy - Mail</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
index 0f3dc5ad3cb8..20d24f0b4ddf 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
index c959aff1438d..40b08674fc2f 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail-send</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send-default</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
index ef041875d78c..dec612b2dae7 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail-send</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send-storage</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send - Storage</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
index f49e4ddc1e69..fc591c5a56f8 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-model-api</artifactId>
   <name>XWiki Platform - Legacy - Model API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
index 4e92487785b0..515325345d1d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications</artifactId>
   <name>XWiki Platform - Legacy - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
index 56c6ad3892b9..601c300f9f2e 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notification-activitymacro</artifactId>
   <name>XWiki Platform - Legacy - Notification Activity Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
index e792dc74eaa7..df3be8d655ee 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
index e482f3580485..57b8b7b4acec 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-filters</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Filters</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
index 07e8431104e6..90f8a4bb9c1e 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-filters</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-filters-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Filters - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
index a5779727dc0a..b49961adee0d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
index b014918bd791..cc64144c46fa 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
index d0148d280e97..ba3713396155 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers-default</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
index b819f216414b..f2a32abfb149 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-sources</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Sources</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
index 1ced0819c239..1adfc56ab928 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-observation</artifactId>
   <name>XWiki Platform - Legacy - Observation</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
index 7e1ce61aac70..2ed98816c674 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office</artifactId>
   <name>XWiki Platform - Legacy - Office</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
index fcb8936539f6..4f3ac2718a48 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office-importer</artifactId>
   <name>XWiki Platform - Legacy - Office Importer</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
index 33cf6df324d7..8e2bb763d26b 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office-viewer</artifactId>
   <name>XWiki Platform - Legacy - Office Viewer</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
index 48ba8e2239e8..eb7f9cfa4ed2 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-oldcore</artifactId>
   <name>XWiki Platform - Legacy - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
index 7bdf5f32170b..486a49fa49b1 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-refactoring</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
index ed7d6a90a4b1..22199ac55d79 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy-refactoring</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-refactoring-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
index 300acd0fcbb6..c4ad28d0d325 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
index 8a59aabc79c3..afe6db468641 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-macros</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Macros - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
index aca7f71397c0..1502465e1de3 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-macro-include</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Macros - Include Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
index 10d0566ed8df..89cca1bb5aac 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
index fac1291ac996..3de753d6896a 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro-api</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
index 9e8cfef2701d..536171fa302e 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro-store</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge - Store</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
index b9e6f246dc8c..491f8bea25cc 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-resource</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
index d727184f3234..e0b9a7e59433 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-resource-temporary</artifactId>
   <name>XWiki Platform - Legacy - Resource - Temporary</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
index e5deadde01da..01baeb9bb2ff 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security</artifactId>
   <name>XWiki Platform - Legacy - Security</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
index 7d5e05d12c44..f4472fd0e0ef 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security-authentication</artifactId>
   <name>XWiki Platform - Legacy - Security - Authentication</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
index 64b4dcde19da..4338d4924cbe 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-security-authentication</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security-authentication-api</artifactId>
   <name>XWiki Platform - Legacy - Security - Authentication - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
index aa9f372745e7..c335fb7932fe 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-url</artifactId>
   <name>XWiki Platform - Legacy - URL</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
index 3dbaa6a28c3e..70b1e4fa86d5 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-web</artifactId>
   <name>XWiki Platform - Legacy - Web Resources</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
index 4db3a195a893..00911e1feb1c 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
index 9133e2676363..691493a11bb8 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-api</artifactId>
   <name>XWiki Platform - LESS CSS - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
index 4c2a37de4cca..709e0d9ba6cc 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-default</artifactId>
   <name>XWiki Platform - LESS CSS - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
index b0acc24e2608..535dc662838f 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-script</artifactId>
   <name>XWiki Platform - LESS CSS - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/pom.xml b/xwiki-platform-core/xwiki-platform-like/pom.xml
index f718981798fc..aa3a3886d381 100644
--- a/xwiki-platform-core/xwiki-platform-like/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like</artifactId>
   <name>XWiki Platform - Like - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
index 8f6ee81018b8..78e4a2712a88 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-api</artifactId>
   <name>XWiki Platform - Like - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
index 214b1f23dd2c..1d7de45a2415 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-notifications</artifactId>
   <name>XWiki Platform - Like - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
index dfb3873fc160..2d7199ce25c4 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test</artifactId>
   <name>XWiki Platform - Like - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
index 0202daad3fe7..2b1457a04051 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test-docker</artifactId>
   <name>XWiki Platform - Like - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
index 2a3fc6acfffe..9f35a830dbd9 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test-pageobjects</artifactId>
   <name>XWiki Platform - Like - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
index 5861ece34635..7c22f8f56a20 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-ui</artifactId>
   <name>XWiki Platform - Like - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-link/pom.xml b/xwiki-platform-core/xwiki-platform-link/pom.xml
index 0f0985ad63f1..ff2bef28923f 100644
--- a/xwiki-platform-core/xwiki-platform-link/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-link/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-link</artifactId>
   <name>XWiki Platform - Link</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
index deb0fa45f507..e32cae2d6e45 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker</artifactId>
   <name>XWiki Platform - LinkChecker - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
index b071cf8b4ea9..43aed0989720 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-api</artifactId>
   <name>XWiki Platform - LinkChecker - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
index a76ab401cb9b..bb03b35e3315 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
index 78e7d52d9b90..3b146797328e 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test-pageobjects</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
index f8dbe7f2e421..b69423434959 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test-tests</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
index 081507e166fe..c7b54e460a61 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-ui</artifactId>
   <name>XWiki Platform - LinkChecker - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/pom.xml
index c59cd28b5766..a92491f6a702 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata</artifactId>
   <name>XWiki Platform - Live Data</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
index f92397b14958..a95e2d158871 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
index 9c91b140637d..4c3a6646c3c7 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-livetable</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
index aa22a9ac341c..1ef419ab749e 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
index 0f985f0d2585..b3d61a55e596 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-rest</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
index 7b6d0fe41c9c..162978b61522 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test</artifactId>
   <name>XWiki Platform - Live Data - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
index 32317080256d..16e553532c49 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test-docker</artifactId>
   <name>XWiki Platform - Live Data - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
index 9d79c1fd87bd..63a2409a2ed7 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test-pageobjects</artifactId>
   <name>XWiki Platform - Live Data - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
index 8af662a45152..2d143b4498ec 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-war</artifactId>
   <name>XWiki Platform - Live Data - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
index ecc33223f1d5..3e6d53b8a355 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-livedata-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livetable/pom.xml b/xwiki-platform-core/xwiki-platform-livetable/pom.xml
index d1a7401657b3..ab8dd02c105c 100644
--- a/xwiki-platform-core/xwiki-platform-livetable/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livetable/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livetable</artifactId>
   <name>XWiki Platform - Livetable</name>
diff --git a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
index 60c22d0c4dd2..f6b0dd234a82 100644
--- a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livetable</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livetable-ui</artifactId>
   <name>XWiki Platform - Livetable - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/pom.xml b/xwiki-platform-core/xwiki-platform-localization/pom.xml
index 2cfbda505145..11266332b232 100644
--- a/xwiki-platform-core/xwiki-platform-localization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization</artifactId>
   <name>XWiki Platform - Localization - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
index e399e90a986f..45efab4fd40a 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-api</artifactId>
   <name>XWiki Platform - Localization - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
index 3b1cdfc3665a..284fd266e87b 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-macro</artifactId>
   <name>XWiki Platform - Localization - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
index a53831075d6f..01082716becf 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest</artifactId>
   <name>XWiki Platform - Localization - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
index 739ad5901d74..6c8ec1601eb7 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest-api</artifactId>
   <name>XWiki Platform - Localization - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
index f1ef6571780b..1a62871f635b 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest-default</artifactId>
   <name>XWiki Platform - Localization - REST - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
index c04adc4cdb88..28892a21445b 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-script</artifactId>
   <name>XWiki Platform - Localization - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
index a4705914a7ef..80077a12d8c1 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-sources</artifactId>
   <name>XWiki Platform - Localization - Sources Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
index b5e8c759b135..950c11f4c50a 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-jar</artifactId>
   <name>XWiki Platform - Localization - Source - JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
index 6a98b903985a..3abe0cefbdf8 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-legacy</artifactId>
   <name>XWiki Platform - Localization - Source - Legacy</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
index 27fb1fe9a121..ed15ad9662ea 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-wiki</artifactId>
   <name>XWiki Platform - Localization - Source - Wiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
index ec1d944f940d..265aa100eab3 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-syntaxes</artifactId>
   <name>XWiki Platform - Localization - Syntaxes Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
index bc8a221d0623..327cc5a75519 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-syntaxes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-syntax-messagetool</artifactId>
   <name>XWiki Platform - Localization - Syntax - MessageTool</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
index 778114b9988b..421dea5f657f 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-test</artifactId>
   <name>XWiki Platform - Localization - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
index e447ca4f301c..e0c83776fbd3 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-test-docker</artifactId>
   <name>XWiki Platform - Localization - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
index 41e0ff2cfd8c..69f9794a64d7 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-localization-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-logging/pom.xml b/xwiki-platform-core/xwiki-platform-logging/pom.xml
index 76563e6c146c..1f524f9f45fc 100644
--- a/xwiki-platform-core/xwiki-platform-logging/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging</artifactId>
   <name>XWiki Platform - Loggging</name>
diff --git a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
index a521722a3ff0..4af21835c7b4 100644
--- a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-logging</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging-script</artifactId>
   <name>XWiki Platform - Logging - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
index bf5f407d6b5b..4372b78c9aba 100644
--- a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-logging</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging-ui</artifactId>
   <name>XWiki Platform - Logging - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/pom.xml b/xwiki-platform-core/xwiki-platform-mail/pom.xml
index f27611218743..9a3c134f6a08 100644
--- a/xwiki-platform-core/xwiki-platform-mail/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>xwiki-platform-mail</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
index b194da3744e0..d068fbf2be31 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
index aafc2eb16491..6213088a6048 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-general</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
index 99a5583033aa..ad2568c699d8 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>xar</packaging>
   <artifactId>xwiki-platform-mail-resender-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
index 34fd8a756fdb..8ffc21d9ec2e 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
index 7826440d5014..2935edabd697 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>xwiki-platform-mail-send</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
index facdfa42921d..7b34e06b63ee 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
index 800dc2d7d269..3070f6214710 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
index bee362fed0a3..15f02838cd38 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-storage</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
index eae7cc64246a..5a167b902328 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test</artifactId>
   <name>XWiki Platform - Mail - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
index 43f56687ab44..80057a5e5a43 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test-docker</artifactId>
   <name>XWiki Platform - Mail - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
index 8f6599a61d48..8b05e7dc5905 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test-pageobjects</artifactId>
   <name>XWiki Platform - Mail - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
index 0924e08e9552..4bd3a905acf5 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>xar</packaging>
   <artifactId>xwiki-platform-mail-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mailsender/pom.xml b/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
index 634126e1ce4f..be31a42181e3 100644
--- a/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mailsender</artifactId>
   <name>XWiki Platform - Mail Sender</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/pom.xml
index 08c68a3eeb45..68e4b7aa31cb 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions</artifactId>
   <name>XWiki Platform - Mentions - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
index 7437c62e3385..742dbb8ebb34 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-api</artifactId>
   <name>XWiki Platform - Mentions - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
index 8d46053069dc..eec592077751 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-mentions-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
index 43db27641efd..49fbdc657721 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-notifications</artifactId>
   <name>XWiki Platform - Mentions - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
index a721a8096800..3b00a19897c2 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test</artifactId>
   <name>XWiki Platform - Mentions - Test - POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
index a9696704d652..497afbca0efc 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test-docker</artifactId>
   <name>XWiki Platform - Mentions - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
index c48f40f835a0..60cf379b2ea5 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-mentions-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test-pageobjects</artifactId>
   <name>XWiki Platform - Mentions - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
index b20d8e40dce2..bdf279aa6da5 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-menu/pom.xml b/xwiki-platform-core/xwiki-platform-menu/pom.xml
index addd60df0acf..97982871ce81 100644
--- a/xwiki-platform-core/xwiki-platform-menu/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu</artifactId>
   <name>XWiki Platform - Menu</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
index 6adff969548e..04260cf63230 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test</artifactId>
   <name>XWiki Platform - Menu - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
index 23ae47734ac6..6948f07a60a8 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test-docker</artifactId>
   <name>XWiki Platform - Menu - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
index f216f8071b66..d0a31a42f66d 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test-pageobjects</artifactId>
   <name>XWiki Platform - Menu - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
index 0a517c2c8180..442e2e00906a 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-ui</artifactId>
   <name>XWiki Platform - Menu - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
index f1113a8e87a3..d138f1b64cfc 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream</artifactId>
   <name>XWiki Platform - Message Stream - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
index 37b14d5c14c1..0b7e80d4c433 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-api</artifactId>
   <name>XWiki Platform - Message Stream - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
index 79b1d92138bd..10c9dd75f1f7 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-test</artifactId>
   <name>XWiki Platform - Message Stream - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
index 9d473fe9e514..0ff71348f7a0 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-test-tests</artifactId>
   <name>XWiki Platform - Message Stream - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
index 500be05ff3b9..831b97a2339c 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml b/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
index 7aac51f3f0a4..7213b5bdefac 100644
--- a/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-minimaldependencies</artifactId>
   <name>XWiki Platform - Minimal WAR Dependencies</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/pom.xml b/xwiki-platform-core/xwiki-platform-model/pom.xml
index d9b7cf90a7ff..21cbbc6bbebf 100644
--- a/xwiki-platform-core/xwiki-platform-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model</artifactId>
   <name>XWiki Platform - Model - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
index 6ec50baec665..d9cd946d1731 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-api</artifactId>
   <name>XWiki Platform - Model - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
index 74fa6aec8df8..be18354d68ab 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation</artifactId>
   <name>XWiki Platform - Model - Validation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
index f486df1f5a63..57fd60bf663a 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-api</artifactId>
   <name>XWiki Platform - Model - Validation - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
index 3f6e9c52677b..5209811852e7 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-default</artifactId>
   <name>XWiki Platform - Model - Validation - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
index 35e4d594ffef..c5f9ed5d86a1 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-ui</artifactId>
   <name>XWiki Platform - Model - Validation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/pom.xml
index 2cb655b74f03..698716f1c9ad 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux</artifactId>
   <name>XWiki Platform - Netflux</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
index d4d0c3b8a151..91f9a1ce3379 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-netflux</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux-api</artifactId>
   <name>XWiki Platform - Netflux - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
index 69d6f8aa628b..8e475a395778 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-netflux</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux-rest</artifactId>
   <name>XWiki Platform - Netflux - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
index 143d5e617655..9e0883197af6 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications</artifactId>
   <name>XWiki Platform - Notifications - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
index 281bde648b19..aee0d71c61f1 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-api</artifactId>
   <name>XWiki Platform - Notifications - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
index 349df86d2179..eccfd1b9dbaa 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters</artifactId>
   <name>XWiki Platform - Notifications - Filters - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
index 674d198fe97e..587cf188d68c 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-api</artifactId>
   <name>XWiki Platform - Notifications - Filters - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
index 505d1a2fe0ed..01b5b12399b0 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-default</artifactId>
   <name>XWiki Platform - Notifications - Filters - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
index c0f88bfc1db8..145aa6ee6e29 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-watch</artifactId>
   <name>XWiki Platform - Notifications - Filters - Watch</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
index 8cac6d2f8aaf..5d6a09ab485c 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Notifications - Macro - Parent POM</name>
   <artifactId>xwiki-platform-notifications-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
index e8d324f3e3fb..4efaaed4d8ce 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-macro</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Notifications - Macro - UI</name>
   <artifactId>xwiki-platform-notifications-macro-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
index 8755810b3389..751e377a6522 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
index 179edd839590..085f41b34316 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-notifiers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers-api</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
index 45d7aa52ff2b..d69e8c2e9545 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-notifiers</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers-default</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - Default bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
index d9076c18d007..5f3e4e4dcc26 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences</artifactId>
   <name>XWiki Platform - Notifications - Preferences - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
index ebbca01e113b..e56093be374b 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-preferences</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences-api</artifactId>
   <name>XWiki Platform - Notifications - Preferences - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
index 27902d8cec62..f482aa8448c2 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-preferences</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences-default</artifactId>
   <name>XWiki Platform - Notifications - Preferences - Default bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
index 805dde226db8..8a295fef157e 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-rest</artifactId>
   <name>XWiki Platform - Notifications - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
index 0c0f52e56fd1..7f183e8d1187 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-script</artifactId>
   <name>XWiki Platform - Notifications - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
index f3e02c3c4552..a461d302c741 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-sources</artifactId>
   <name>XWiki Platform - Notifications - Sources</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
index 305b971fdb57..4c04e77ab705 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test</artifactId>
   <name>XWiki Platform - Notifications - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
index a59f6634401f..7e071cc0d9cc 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test-docker</artifactId>
   <name>XWiki Platform - Notifications - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
index 5bdb1e7cfb6c..1edbb8f7f90f 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test-pageobjects</artifactId>
   <name>XWiki Platform - Notifications - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
index 94a3332aa8fb..545fc4c503a9 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-ui</artifactId>
   <name>XWiki Platform - Notifications - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/pom.xml b/xwiki-platform-core/xwiki-platform-observation/pom.xml
index 96e8a7c137c7..ea123a067c86 100644
--- a/xwiki-platform-core/xwiki-platform-observation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation</artifactId>
   <name>XWiki Platform - Observation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
index d419e0bccfd0..ed3356105a15 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-remote</artifactId>
   <name>XWiki Platform - Observation - Remote</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
index 5b58e3da7f44..3df32216baa9 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-test</artifactId>
   <name>XWiki Platform - Observation - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
index 779b7b04dc24..1c287277e2c4 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-test-tests</artifactId>
   <name>XWiki Platform - Observation - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/pom.xml b/xwiki-platform-core/xwiki-platform-office/pom.xml
index 61623f0a39ff..865fc624bb50 100644
--- a/xwiki-platform-core/xwiki-platform-office/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office</artifactId>
   <name>XWiki Platform - Office - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
index 507a0acc0750..7f2859a89eec 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-importer</artifactId>
   <name>XWiki Platform - Office - Importer</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
index 738605d6fc90..c697aed5028f 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-macro</artifactId>
   <name>XWiki Platform - Office - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
index 214dfe0ea207..fd64b9c0d267 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test</artifactId>
   <name>XWiki Platform - Office - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
index f2bbfb0ee00a..c7022ff18db0 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test-docker</artifactId>
   <properties>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
index ea4529a71eae..ac2b95540b6e 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test-pageobjects</artifactId>
   <name>XWiki Platform - Office - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
index 464014868c9f..18052b97d1a1 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
index 398f7bb2a459..9656e53e390d 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-viewer</artifactId>
   <name>XWiki Platform - Office - Viewer</name>
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
index 312a7d13b0a4..4b0f0d2f178a 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-oldcore</artifactId>
   <name>XWiki Platform - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/pom.xml b/xwiki-platform-core/xwiki-platform-panels/pom.xml
index baa0932fb3a1..c7739da0b5c6 100644
--- a/xwiki-platform-core/xwiki-platform-panels/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels</artifactId>
   <name>XWiki Platform - Panels</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
index 1d824e9cb44e..b5c34c87b64f 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-api</artifactId>
   <name>XWiki Platform - Panels - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
index 973172613f5d..1472bcd70a28 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test</artifactId>
   <name>XWiki Platform - Panels - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
index 1f76364c4845..aad232589fa5 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-content</artifactId>
   <name>XWiki Platform - Panels - Tests - Content</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
index 3b026ee30fb1..29aacbb3df47 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-panels-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-panels-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
index d1adf9e3aa77..05961288b726 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-pageobjects</artifactId>
   <name>XWiki Platform - Panels - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
index 96efa51f357d..fd87e049bc98 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-tests</artifactId>
   <name>XWiki Platform - Panels - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
index 516afa9aa741..9d1a199caf07 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-ui</artifactId>
   <name>XWiki Platform - Panels - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/pom.xml b/xwiki-platform-core/xwiki-platform-query/pom.xml
index ca8eb91db22e..d8695cedc59b 100644
--- a/xwiki-platform-core/xwiki-platform-query/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query</artifactId>
   <name>XWiki Platform - Query - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
index f224b5842e1f..e617c1e7f3bc 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-jpql-parser</artifactId>
   <name>XWiki Platform - Query - JPQL Parser</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
index 2b7a49f2eedb..41a83868e9e0 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-manager</artifactId>
   <name>XWiki Platform - Query - Manager</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
index 539d35629dd9..a09150d5036c 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-xwql</artifactId>
   <name>XWiki Platform - Query - XWQL</name>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/pom.xml
index 88517c3f0577..f51d17aa540e 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
index 2fb4b1d79a1b..c5e115623a6c 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ratings</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings-api</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
index 617114c3400a..27aea6743c97 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ratings</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/pom.xml
index 53702cfab47a..47d699c79758 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime</artifactId>
   <name>XWiki Platform - Realtime - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
index 03c09516d169..7d8e944ac534 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-ui</artifactId>
   <name>XWiki Platform - Realtime - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
index d75b876f9caa..a972c857463b 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
index 0be234d1cc6c..adb0f79f5f5f 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
index eb379bcfa73b..211b5c3e142b 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
index d68d3d1fe945..0009f7fac1ee 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test-docker</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
index e848f8ed5c16..b70cfcd10ba4 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test-pageobjects</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
index ba9249f2590b..83c88296b9cc 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-ui</artifactId>
   <name>XWiki Platform - Realtime - Wiki - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
index 644b4cc65884..65d9a769cd46 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-wiki-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
index bff35d704485..4be99d8d857a 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
index 5ecdfe2edaf7..513973011d28 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
index fe625543c586..87bdcd73ce57 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test-docker</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
index 9d29c3c695db..a1e7cf7b6c3e 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test-pageobjects</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
index 4d43a8539463..8d4b64500346 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-ui</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
index 72fd321051ee..061784ecea9d 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-wysiwyg-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
index 080a1941e6cb..6231dd05ee04 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring</artifactId>
   <name>XWiki Platform - Refactoring - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
index 3ec557c913de..b7b215d0f8b5 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-api</artifactId>
   <name>XWiki Platform - Refactoring - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
index aba7f334e443..405c6e89fa6f 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-default</artifactId>
   <name>XWiki Platform - Refactoring - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
index 9c4bef332c5e..dc438680819a 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-ui</artifactId>
   <name>XWiki Platform - Refactoring - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/pom.xml b/xwiki-platform-core/xwiki-platform-release/pom.xml
index e24f5a488276..c1f932c43657 100644
--- a/xwiki-platform-core/xwiki-platform-release/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release</artifactId>
   <name>XWiki Platform - Release</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
index 3942f8b5ad7f..45567bbb7fe3 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test</artifactId>
   <name>XWiki Platform - Release - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
index 8b57fd7e6d8b..d7d2524c5d8b 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test-docker</artifactId>
   <name>XWiki Platform - Release - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
index e4ac51351b4f..79a2af5ad620 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test-pageobjects</artifactId>
   <name>XWiki Platform - Release - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
index 69520b9d76f0..201efe21242b 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-ui</artifactId>
   <name>XWiki Platform - Release - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/pom.xml
index 7a8b87a2e63b..67533f1f65e8 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering</artifactId>
   <name>XWiki Platform - Rendering - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
index 0fdd5698f0b0..61ae1b2dc9bb 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async</artifactId>
   <name>XWiki Platform - Rendering - Async - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
index c4e15a70f882..07151cff11e4 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-api</artifactId>
   <name>XWiki Platform - Rendering - Async - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
index 5b81534bf14c..ec9b96a2316f 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-default</artifactId>
   <name>XWiki Platform - Rendering - Async - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
index 37cb36ba7c7a..7906b5abd533 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-macro</artifactId>
   <name>XWiki Platform - Rendering - Async - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
index 3a63053754bf..79a87ae57e6e 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration</artifactId>
   <name>XWiki Platform - Rendering - Configuration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
index 45f9cb48127e..a2cad2a68934 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-configuration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration-api</artifactId>
   <name>XWiki Platform - Rendering - Configuration - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
index 282037de2b4c..4165e6c46c4e 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-configuration</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration-default</artifactId>
   <name>XWiki Platform - Rendering - Configuration - Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
index 196a8c83aa2f..6227396242fc 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macros</artifactId>
   <name>XWiki Platform - Rendering - Macros - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
index 02397bc530cc..06d392b92bdb 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-cache</artifactId>
   <name>XWiki Platform - Rendering - Macro - Cache</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
index dbd1c6543b91..1e7c2da481e0 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-code-oldcore</artifactId>
   <name>XWiki Platform - Rendering - Macro - Code Oldcore</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
index d67de8e853ba..02143b1f6d05 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-code</artifactId>
   <name>XWiki Platform - Rendering - Macro - Code</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
index 016e7807e63e..54dd7b017684 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-container</artifactId>
   <name>XWiki Platform - Rendering - Macro - Container</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
index c1d7588ea59b..e748c6f8885c 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-context</artifactId>
   <name>XWiki Platform - Rendering - Macro - Context</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
index 58a7ba224199..d4b00d717d34 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-gallery</artifactId>
   <name>XWiki Platform - Rendering - Macro - Gallery</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
index 82fad3ec7b30..31bc9539d817 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-groovy</artifactId>
   <name>XWiki Platform - Rendering - Macro - Groovy</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
index 8231301cf6d4..bb146297e0cb 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-include</artifactId>
   <name>XWiki Platform - Rendering - Macro - Include</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
index 414f44afe69b..07df34159df5 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-python</artifactId>
   <name>XWiki Platform - Rendering - Macro - Python</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
index 71301258c267..bf02bc110c27 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-script</artifactId>
   <name>XWiki Platform - Rendering - Macro - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
index 17b7dc542c9b..82bca18c01b7 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-toc</artifactId>
   <name>XWiki Platform - Rendering - Macro - Toc</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
index 2f9b7a512fc3..b94dddd249b1 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-useravatar</artifactId>
   <name>XWiki Platform - Rendering - Macro - User Avatar</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
index 208ccc585d93..eb7e99488801 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-velocity</artifactId>
   <name>XWiki Platform - Rendering - Macro - Velocity</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
index fc495c426e26..8d2c09f555d5 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-parser</artifactId>
   <name>XWiki Platform - Rendering - Parser</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
index 21fe60c42aab..e33f9940c7ad 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-rendering</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-signature</artifactId>
   <name>XWiki Platform - Rendering - Signature</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
index 79f0e840ad10..5e0303757f06 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformations</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
index baaacf929ff3..5389d260ace7 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-api</artifactId>
   <name>XWiki Platform - Rendering - Transformations - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
index 466a794321bd..6e30329e8572 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-icon</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Icon</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
index 19f9cef15be4..67b1a27e6fce 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-macro</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
index 7a7500b93006..6a356b74e900 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-ui</artifactId>
   <name>XWiki Platform - Rendering - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
index 6f10d2ae6732..bb97b23f1b82 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
index 9d090a1a39f8..209e7de22738 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro-api</artifactId>
   <name>XWiki Platform - Rendering - Wiki Macro Bridge - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
index cdaac026c5e6..674cf6466a5b 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro-store</artifactId>
   <name>XWiki Platform - Rendering - Wiki Macro Bridge - Store</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
index abc0ad755729..628faf61249c 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-xwiki</artifactId>
   <name>XWiki Platform - Rendering - XWiki-specific Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/pom.xml b/xwiki-platform-core/xwiki-platform-repository/pom.xml
index a255db74fe3f..d0952e113518 100644
--- a/xwiki-platform-core/xwiki-platform-repository/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository</artifactId>
   <name>XWiki Platform - Repository</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
index d68ee461c0f2..c859db97be8e 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-server-api</artifactId>
   <name>XWiki Platform - Repository - Server API</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
index 7ee8bbd43001..7d721e291f5a 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-server-ui</artifactId>
   <name>XWiki Platform - Repository - Server UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
index 4caaf43e0282..f986d91de2a6 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test</artifactId>
   <name>XWiki Platform - Repository - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
index 7578913cdcaf..1a43bed842e8 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-pageobjects</artifactId>
   <name>XWiki Platform - Repository - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
index 4bd440af8156..feb99006e046 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-tests</artifactId>
   <name>XWiki Platform - Repository - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
index a7594a67c801..bf759be91196 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-utils</artifactId>
   <name>XWiki Platform - Repository - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/pom.xml b/xwiki-platform-core/xwiki-platform-resource/pom.xml
index c91e83791f97..a345215c7b23 100644
--- a/xwiki-platform-core/xwiki-platform-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource</artifactId>
   <name>XWiki Platform - Resource - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
index 5ad16dad96bd..ce0f585027dc 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-api</artifactId>
   <name>XWiki Platform - Resource - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
index 414c76fa7084..7bd5b3855ab2 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-default</artifactId>
   <name>XWiki Platform - Resource - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
index 570b904c7efd..8c2c08abf6e7 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-servlet</artifactId>
   <name>XWiki Platform - Resource - Servlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
index 7f6c9af506cf..4519a00755dc 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-temporary</artifactId>
   <name>XWiki Platform - Resource - Temporary</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
index 12a8ab96f2d0..5bc27bae634c 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-test</artifactId>
   <name>XWiki Platform - Resource - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
index e2225ddc540e..124ba8bca523 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-test-tests</artifactId>
   <name>XWiki Platform - Resource - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/pom.xml b/xwiki-platform-core/xwiki-platform-rest/pom.xml
index a1a518dfc691..d1781fee5cd8 100644
--- a/xwiki-platform-core/xwiki-platform-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
index 689ff27a5afc..57c1df7678c8 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-api</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
index fce6e5898f77..0e22c844f070 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-model</artifactId>
   <name>XWiki Platform - REST - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
index 22b520e18bbc..e0f82b91b1a9 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-server</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
index 5453030b0b2a..70c59bf0e10f 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-test</artifactId>
   <name>XWiki Platform - REST - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
index 995cb3e1737a..bfc8bae9c901 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-test-tests</artifactId>
   <name>XWiki Platform - REST - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-sandbox/pom.xml b/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
index 3731f53e455b..6fbf16504daa 100644
--- a/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sandbox</artifactId>
   <name>XWiki Platform - Sandbox Application</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
index b88d58351fdb..cf59156b8816 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler</artifactId>
   <name>XWiki Platform - Scheduler - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
index ef7335ef8f5e..c9d3f3a8e9ae 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-api</artifactId>
   <name>XWiki Platform - Scheduler - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
index 40db931f0faf..bed6c112807c 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
index 5ef32f0b4f9a..ab5e9233b9bd 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test-docker</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
index aeabb3a8a444..e3aa1a5d3e06 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test-pageobjects</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
index f35e9b64dcf1..ef8abbb9e833 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-ui</artifactId>
   <name>XWiki Platform - Scheduler - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/pom.xml b/xwiki-platform-core/xwiki-platform-search/pom.xml
index 6d07bfb5d0ce..d45524cc9960 100644
--- a/xwiki-platform-core/xwiki-platform-search/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search</artifactId>
   <name>XWiki Platform - Search - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
index 540d76f7a8ba..3ea0f24ca0d6 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-api</artifactId>
   <name>XWiki Platform - Search - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
index 1316aa8d2de3..75ca7f0f6deb 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-search</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
index 781640ab80a9..28609beeaadb 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-api</artifactId>
   <name>XWiki Platform - Search - Solr - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
index 9749e350c0f6..10075c8514f2 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-search-solr</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-query</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
index 3051f723a59b..e200765f291c 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-rest</artifactId>
   <name>XWiki Platform - Search - SOLR - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
index 3bdbeb68eeb8..d5f614c4bcc8 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server</artifactId>
   <name>XWiki Platform - Search - SOLR - Server</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
index f4b69fe2bdc0..4bea8c712c59 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
   <name>XWiki Platform - Search - SOLR - Server - Minimal Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
index 4a1569fa4187..1448d646a2c3 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-core</artifactId>
   <name>XWiki Platform - Search - SOLR - Server - Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
index f4c1eb11a48a..2e183b390201 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-plugin</artifactId>
   <name>XWiki Platform - Search - Solr - Server - Plugin</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
index cc27c38254f6..19fda8210c2d 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
index 4bcdb825463c..447423c43cde 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-docker</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
index 96b908043f36..17042e5b96a3 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-pageobjects</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
index 823f4a387a01..32b0897e4b05 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-utils</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
index 85db55f8f95f..f41da06943e3 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
index 5ff18ea17c62..f0d3c125d057 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-ui</artifactId>
   <name>XWiki Platform - Search - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/pom.xml b/xwiki-platform-core/xwiki-platform-security/pom.xml
index 2975c7fc419a..600670057892 100644
--- a/xwiki-platform-core/xwiki-platform-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security</artifactId>
   <name>XWiki Platform - Security - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
index 228081a60d9e..88feda9f48df 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-api</artifactId>
   <name>XWiki Platform - Security - Generic Security API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
index eda809053f6d..f241410c7b36 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>xwiki-platform-security</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
index 996c85c40fed..5d3a5c1fedfe 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
index f00bc1ddfe6e..c6ef8bdb5e63 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
index 5dd3e8656f52..0a1cc2f672f3 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>xwiki-platform-security-authentication</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
index a14ac0855b57..05f29a59594c 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authentication-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
index bbdddb840576..c83fcf57b30d 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
index c195d719266f..eafe3245933f 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-api</artifactId>
   <name>XWiki Platform - Security - Authorization - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
index 624e2a360098..9b395c5c950e 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-bridge</artifactId>
   <name>XWiki Platform - Security - Authorization - Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
index 4b623e23cf7b..fe72106798d3 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-script</artifactId>
   <name>XWiki Platform - Security - Authorization - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
index e75ac1d5707a..b17aee1a5463 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
index 940e88074f42..2d35508a9ed2 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-api</artifactId>
   <name>XWiki Platform - Security - Required Rights - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
index 07648a5ac5f8..98ce498ea9e6 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-default</artifactId>
   <name>XWiki Platform - Security - Required Rights - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
index 39fca049c5d7..4771b4f86cc7 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-macro</artifactId>
   <name>XWiki Platform - Security - Required Rights - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
index ca6200263ff1..c88a95db8cce 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
index 068d497ab0df..630f6464c435 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test-docker</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
index 604856384205..5729559a4ba2 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test-pageobjects</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
index f6752134167a..ae2ca2dec844 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage</artifactId>
   <name>XWiki Platform - Share Page - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
index 0bf97e1d21d7..390042cb7c31 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-api</artifactId>
   <name>XWiki Platform - Share Page - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
index f2e0480d4b8a..be6f6e7fced5 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test</artifactId>
   <name>XWiki Platform - Share Page - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
index 5ea2a51ae7f8..fecfe4d4f8e9 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test-docker</artifactId>
   <name>XWiki Platform - Share Page - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
index 5513718c26e7..fe5af22ff284 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test-pageobjects</artifactId>
   <name>XWiki Platform - Share Page - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
index e26f7733ce93..504b51af2ee4 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-ui</artifactId>
   <name>XWiki Platform - Share Page - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/pom.xml
index 1495467ab7d9..59fffdbcf696 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet</artifactId>
   <name>XWiki Platform - Sheet - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
index 99352f45984d..6223c46808ed 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sheet</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet-api</artifactId>
   <name>XWiki Platform - Sheet - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
index 5e272058d7c8..7d2bd8e81bf4 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sheet</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet-ui</artifactId>
   <name>XWiki Platform - Sheet - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/pom.xml b/xwiki-platform-core/xwiki-platform-skin/pom.xml
index 30872b17bb1a..d2b0b17d15eb 100644
--- a/xwiki-platform-core/xwiki-platform-skin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin</artifactId>
   <name>XWiki Platform - Skin - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
index e25ac4fa8830..f961fbfa326d 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-api</artifactId>
   <name>XWiki Platform - Skin - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
index fe4e0ee5ba6c..65aad8108221 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-skinx</artifactId>
   <name>XWiki Platform - Skin - Skin Extensions</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
index 20b885879572..d89d60ef1ef8 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test</artifactId>
   <name>XWiki Platform - Skin - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
index 4f8f1cf207af..6f051efbfaee 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test-docker</artifactId>
   <name>XWiki Platform - Skin - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
index c3966a226cf9..4c47a7c816c9 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test-pageobjects</artifactId>
   <name>XWiki Platform - Skin - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
index a6a62c83ac22..6c24aca8386e 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-ui</artifactId>
   <name>XWiki Platform - Skin - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-statistics/pom.xml b/xwiki-platform-core/xwiki-platform-statistics/pom.xml
index 3fe01d5a56b2..a3ec984384b5 100644
--- a/xwiki-platform-core/xwiki-platform-statistics/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-statistics/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-statistics</artifactId>
   <name>XWiki Platform - Statistics</name>
diff --git a/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml b/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
index 3832816006e3..8fd2915e6b93 100644
--- a/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-statistics</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-statistics-ui</artifactId>
   <name>XWiki Platform - Statistics - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/pom.xml b/xwiki-platform-core/xwiki-platform-store/pom.xml
index 68f45855c96f..9a5ec4ce3483 100644
--- a/xwiki-platform-core/xwiki-platform-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store</artifactId>
   <name>XWiki Platform - Store - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
index 7483741df0e0..efeb9f9505b5 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-api</artifactId>
   <name>XWiki Platform - Store - Api</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
index 80413a3b34cf..93c58dc29072 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-filesystem-oldcore</artifactId>
   <name>XWiki Platform - Store - Filesystem - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
index 12eeae12cba8..f0c304c9acc8 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-filesystem</artifactId>
   <name>XWiki Platform - Store - Filesystem</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
index 5718ae656ae2..f886dbf2f051 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-locks</artifactId>
   <name>XWiki Platform - Store - Locks</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
index a3225e5e8a52..fd03b812096f 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-store-merge</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
index 175e660e3343..b2b40ec41656 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store-merge</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-store-merge-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
index dcfb1e8fe162..bd8a27e16f8d 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store-merge</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
index d38189d95d6b..a4a39f3b4a90 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-serialization</artifactId>
   <name>XWiki Platform - Store - Serialization</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
index 7c7b83ce2341..a5436d8e8b2c 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-transaction</artifactId>
   <name>XWiki Platform - Store - Transaction</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/pom.xml b/xwiki-platform-core/xwiki-platform-tag/pom.xml
index 4ab1bff2adf6..1b1c74c2f333 100644
--- a/xwiki-platform-core/xwiki-platform-tag/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag</artifactId>
   <name>XWiki Platform - Tag - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
index 5044cb171128..1777bfd9675c 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-api</artifactId>
   <name>XWiki Platform - Tag - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
index 28e8520e7325..6b0a7eee228e 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test</artifactId>
   <name>XWiki Platform - Tag - Test - POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
index 5dcbaa322a47..9dcd48ca7dee 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test-docker</artifactId>
   <name>XWiki Platform - Tag - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
index c50873c6f3df..e75e2f37519e 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test-pageobjects</artifactId>
   <name>XWiki Platform - Tag - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
index 97529442120b..6104e49e97f7 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-ui</artifactId>
   <name>XWiki Platform - Tag - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-template/pom.xml b/xwiki-platform-core/xwiki-platform-template/pom.xml
index cc73fa45e577..8480c1b8089d 100644
--- a/xwiki-platform-core/xwiki-platform-template/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-template/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-template</artifactId>
   <name>XWiki Platform - Template - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml b/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
index 5066a5a5cd5f..1aa26df5c9c4 100644
--- a/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-template</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-template-api</artifactId>
   <name>XWiki Platform - Template - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/pom.xml b/xwiki-platform-core/xwiki-platform-test/pom.xml
index 831b49054143..54d9df01b647 100644
--- a/xwiki-platform-core/xwiki-platform-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test</artifactId>
   <name>XWiki Platform - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
index db0e62c4fedf..7e447a567b61 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-checker</artifactId>
   <name>XWiki Platform - Test - Runtime Checker Tools</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
index 04cf5f958e7e..48e074636aba 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-docker</artifactId>
   <name>XWiki Platform - Test - Docker UI Test Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
index 61c857e72f86..cdbfc8caeb47 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-integration</artifactId>
   <name>XWiki Platform - Test - Integration Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
index 835ad0cc3fc3..1419cc991df7 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-oldcore</artifactId>
   <name>XWiki Platform - Test - Oldcore</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
index e33612404c55..fc254d8a0231 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-page</artifactId>
   <name>XWiki Platform - Test - Page Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
index 99c2d39e6628..a04f5b9422e8 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-rest</artifactId>
   <name>XWiki Platform - Test - Rest</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
index 69470147a1bf..4aa2e5e35ab4 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-ui</artifactId>
   <name>XWiki Platform - Test - UI Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
index 262ff67dc99d..d75f69246e91 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-upgrade</artifactId>
   <name>XWiki Platform - Test - Distribution Upgrade</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/pom.xml b/xwiki-platform-core/xwiki-platform-tika/pom.xml
index 534f10cbc2c8..b7d05179bcaf 100644
--- a/xwiki-platform-core/xwiki-platform-tika/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika</artifactId>
   <name>XWiki Platform - Tika - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
index f137311a008f..3391fd7f59a9 100644
--- a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tika</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika-detect</artifactId>
   <name>XWiki Platform - Tika - Detect</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
index 0394a2fd6ab2..2683feb3cbf5 100644
--- a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tika</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika-parsers</artifactId>
   <name>XWiki Platform - Tika - Parsers</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/pom.xml b/xwiki-platform-core/xwiki-platform-tour/pom.xml
index 799880594bde..c9f5d9aea163 100644
--- a/xwiki-platform-core/xwiki-platform-tour/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
index 2c9f2bee5fcf..aa76ea5773fa 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
index 6058313ebbc4..bf767b5a041f 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test-pageobjects</artifactId>
   <name>XWiki Platform - Tour - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml
index 73428aae41ea..ec16eebb0678 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test-tests</artifactId>
   <name>XWiki Platform - Tour - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
index c74beda97cc9..1f8fc2014377 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tree/pom.xml b/xwiki-platform-core/xwiki-platform-tree/pom.xml
index 08f9fa29690d..2e223b65604c 100644
--- a/xwiki-platform-core/xwiki-platform-tree/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree</artifactId>
   <name>XWiki Platform - Tree - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
index 680434de6786..f0a7a371ba1b 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-api</artifactId>
   <name>XWiki Platform - Tree - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
index 946fa04f9300..f4b3a8fc1684 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-macro</artifactId>
   <name>XWiki Platform - Tree - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
index 2a61f5af80d3..59696f585ae7 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-test-pageobjects</artifactId>
   <name>XWiki Platform - Tree - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
index e48784772f15..e186cb4aff8f 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-war</artifactId>
   <name>XWiki Platform - Tree - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
index a614799068af..c95374ee108c 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-tree-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
index 3dea595cf998..598c2e58f3bd 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension</artifactId>
   <name>XWiki Platform - UI Extension - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
index b553c73b8be8..0153fdbc4791 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-api</artifactId>
   <name>XWiki Platform - UI Extension Extension - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
index dc6dac14c354..d244ce2ffd4e 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-test</artifactId>
   <name>XWiki Platform - UI Extension Extension - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
index 437e53c35a4d..6ab07078f6ad 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-ui</artifactId>
   <name>XWiki Platform - UI Extension - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/pom.xml b/xwiki-platform-core/xwiki-platform-url/pom.xml
index a387684bcfbc..ba86aa9af6bb 100644
--- a/xwiki-platform-core/xwiki-platform-url/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url</artifactId>
   <name>XWiki Platform - URL - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
index d2bbcc379104..72a34767f652 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-api</artifactId>
   <name>XWiki Platform - URL - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
index 32958e581438..48d66c349fe2 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-container</artifactId>
   <name>XWiki Platform - URL - Container</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
index 13a4967c8d1e..769fd7a08af3 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-default</artifactId>
   <name>XWiki Platform - URL - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
index 1be2b293f851..096828f75d6b 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-schemes</artifactId>
   <name>XWiki Platform - URL - Schemes - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
index bc4eb1247994..4ff0bb02508e 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-filesystem</artifactId>
   <name>XWiki Platform - URL - Scheme - Filesystem Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
index 14f8b0497000..25749ccc29f3 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-reference</artifactId>
   <name>XWiki Platform - URL - Scheme - Reference Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
index 55dd67c55cd5..4b449f2066db 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-standard</artifactId>
   <name>XWiki Platform - URL - Scheme - Standard Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/pom.xml b/xwiki-platform-core/xwiki-platform-user/pom.xml
index 4f2c54b19215..ab7e516d9b88 100644
--- a/xwiki-platform-core/xwiki-platform-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user</artifactId>
   <name>XWiki Platform - User - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
index 317d6cb991b0..3c69b5c5c400 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-api</artifactId>
   <name>XWiki Platform - User - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
index 6ec079fdc048..197bddcd7178 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-default</artifactId>
   <name>XWiki Platform - User - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
index edea16d3a059..e83ce1863741 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory</artifactId>
   <name>XWiki Platform - User - Directory - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
index e1c7c37508ef..fe65c73a9281 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
index f027df3ba302..1afb42d2149f 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test-docker</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
index 5bfe357a91ca..ced2c7256d13 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test-pageobjects</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
index fe26636b1350..4cdf8712e4d3 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-ui</artifactId>
   <name>XWiki Platform - User - Directory - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
index a8acdb46f75f..4ae6804ada3d 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile</artifactId>
   <name>XWiki Platform - User - Profile - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
index 572ea5b7d911..f5430081b230 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
index d0f2eee5f545..ddb44a703edd 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test-docker</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
index bbe92f8ca623..f4c5f12f894b 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test-pageobjects</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
index 0a87240ed23c..02a07382a5f0 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-ui</artifactId>
   <name>XWiki Platform - User - Profile - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
index 01dba7eebfeb..244073cfe80c 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-resource</artifactId>
   <name>XWiki Platform - User - Resource</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
index 7b8c01a9ff83..66ead3a2ff7d 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-script</artifactId>
   <name>XWiki Platform - User - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
index c1ca174cf3f5..e2ec63b4d7ce 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-test</artifactId>
   <name>XWiki Platform - User - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
index dea7258ea1d2..89fc222dd70d 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-test-docker</artifactId>
   <name>XWiki Platform - User - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/pom.xml
index f0ed85fb0cc9..d0e216d40cd1 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity</artifactId>
   <name>XWiki Platform - Velocity - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
index 3a2f125e070e..ca4d76552f9a 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-velocity</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity-webapp</artifactId>
   <name>XWiki Platform - Velocity - WebApp Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
index fa779c9a0922..16905587ee99 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-velocity</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity-xwiki</artifactId>
   <name>XWiki Platform - Velocity - Platform Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/pom.xml
index 97e744fcbb4e..3311d2b19b67 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
index 5d5982bcfdc1..68e30bef501d 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-api</artifactId>
   <name>XWiki Platform - VFS - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
index fe6f44cae3ef..c76b64e801b8 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-test</artifactId>
   <name>XWiki Platform - VFS - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
index 1d61145a8fb0..63a1d8c833c9 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-test-docker</artifactId>
   <name>XWiki Platform - VFS - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
index d92a6ac5d9de..0b32a59d3669 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-ui</artifactId>
   <name>XWiki Platform - VFS - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/pom.xml b/xwiki-platform-core/xwiki-platform-web/pom.xml
index ce64a53bed42..6c51a9727fc1 100644
--- a/xwiki-platform-core/xwiki-platform-web/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web</artifactId>
   <name>XWiki Platform - Web - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
index 085480ca315b..ce7f42d2bf14 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-web</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web-templates</artifactId>
   <name>XWiki Platform - Web - Templates</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
index fdb403d7504d..85fbddea0317 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-web</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web-war</artifactId>
   <name>XWiki Platform - Web - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/pom.xml
index 7c60979dcadc..6c0457ec0591 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars</artifactId>
   <name>XWiki Platform - WebJars - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
index 149f74acaa3b..f269c8337a31 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-api</artifactId>
   <name>XWiki Platform - WebJars - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
index 8363d67a3d75..d3e62819c720 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-test</artifactId>
   <name>XWiki Platform - WebJars - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
index 29e06dd6e820..518fda1f3218 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-test-tests</artifactId>
   <name>XWiki Platform - WebJars - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-websocket/pom.xml b/xwiki-platform-core/xwiki-platform-websocket/pom.xml
index 7670bc584e48..7098656639bb 100644
--- a/xwiki-platform-core/xwiki-platform-websocket/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-websocket/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-websocket</artifactId>
   <name>XWiki Platform - WebSocket</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
index 1e0712fbe264..08867e7a36f4 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew</artifactId>
   <name>XWiki Platform - What's New - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
index ab7f04bc6d54..d81f224aa8da 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-api</artifactId>
   <name>XWiki Platform - What's New - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
index eaf5b60b94be..5b6e9a9c2e13 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test</artifactId>
   <name>XWiki Platform - What's New - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
index eab575c52224..71e928be03c1 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test-docker</artifactId>
   <name>XWiki Platform - What's New - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
index f80a49c2a1f3..3b85ff331329 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test-pageobjects</artifactId>
   <name>XWiki Platform - What's New - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
index 71357e87efeb..c9d263bfc383 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-ui</artifactId>
   <name>XWiki Platform - What's New - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/pom.xml
index 04af8001bf95..d7aba13bfdda 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki</artifactId>
   <name>XWiki Platform - Wiki - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
index 27491c585c6d..2e9fc6d2c3df 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-api</artifactId>
   <name>XWiki Platform - Wiki - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
index 5a8814526598..581948099db5 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-creationjob</artifactId>
   <name>XWiki Platform - Wiki - Creation Job</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
index e5b5b625e49b..22327ff623c8 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-default</artifactId>
   <name>XWiki Platform - Wiki - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
index 6b189adc5876..5fdea1e8196d 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest</artifactId>
   <name>XWiki Platform - Wiki - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
index e63bf6a835ef..be5bf546b154 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest-api</artifactId>
   <name>XWiki Platform - Wiki - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
index 9fcd2e33cf68..4e2e36f98f3b 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-rest</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest-default</artifactId>
   <name>XWiki Platform - Wiki - REST - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
index a11b47221289..d7053cacd458 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-script</artifactId>
   <name>XWiki Platform - Wiki - Script services</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
index db62c98c3444..10cd61123ba7 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template</artifactId>
   <name>XWiki Platform - Wiki - Template - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
index 252599a6bef9..cdcc1a4c2615 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-api</artifactId>
   <name>XWiki Platform - Wiki - Template - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
index b7c2a2a20cc0..471ed3085380 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-default</artifactId>
   <name>XWiki Platform - Wiki - Template - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
index 4fb03bb2ef74..d8ab10d934ae 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-script</artifactId>
   <name>XWiki Platform - Wiki - Template - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
index 103d28f42566..d86de342e9ac 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test</artifactId>
   <name>XWiki Platform - Wiki - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
index f98acbdb17b4..a7d1b52c66dc 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test-docker</artifactId>
   <name>XWiki Platform - Wiki - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
index 4e758138b877..39c4ea799f80 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test-pageobjects</artifactId>
   <name>XWiki Platform - Wiki - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
index 1b54d945a0f7..d883717aba8e 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui</artifactId>
   <name>XWiki Platform - Wiki - UI - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
index 53d88daa6b2e..c926b347acc4 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-common</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
index 3a65def2a8db..5b0c9895c5bc 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-mainwiki</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
index 667c1b813eed..7e4d583984c4 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-wiki</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
index 0d2a363da713..c53779a0592d 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user</artifactId>
   <name>XWiki Platform - Wiki - User - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
index e685c5cb7e97..c2e7eea5577d 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-api</artifactId>
   <name>XWiki Platform - Wiki - User - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
index ab1ca4f5fe04..58714e05c0e0 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-default</artifactId>
   <name>XWiki Platform - Wiki - User - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
index 9090178e360e..51e99eb16d7d 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-script</artifactId>
   <name>XWiki Platform - Wiki - User - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
index b9c9a2b94e28..bbb937936a9b 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-workspaces-migrator</artifactId>
   <name>XWiki Platform - Wiki - Workspaces Migrator</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
index ead994c03cb4..77f15974d8e6 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
index c25cb5df839c..dd1f5cd17f34 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wysiwyg</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg-api</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
index 126a05dfd984..2c1fd1cf1416 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wysiwyg</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg-ui</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - Wiki Pages</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/pom.xml b/xwiki-platform-core/xwiki-platform-xar/pom.xml
index 64cdaf4520f1..b14fdb8f6d70 100644
--- a/xwiki-platform-core/xwiki-platform-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar</artifactId>
   <name>XWiki Platform - XAR - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
index 50db210de16a..32529f92f982 100644
--- a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xar</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar-model</artifactId>
   <name>XWiki Platform - XAR - Model API</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
index 94aff86c7525..36019ff2b76d 100644
--- a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xar</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar-script</artifactId>
   <name>XWiki Platform - XAR - Scripting API</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/pom.xml
index c30bd2405ede..71ab74e02e32 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass</artifactId>
   <name>XWiki Platform - XClass - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
index 9b49d6c88c66..e5c1c200f99c 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test</artifactId>
   <name>XWiki Platform - XClass - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
index e2f3bb163813..f45704fcd9f0 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test-docker</artifactId>
   <name>XWiki Platform - XClass - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
index 43793185b7b8..218ba0b0e9c5 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test-pageobjects</artifactId>
   <name>XWiki Platform - XClass - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
index c81123f120d3..3fc18676d108 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-ui</artifactId>
   <name>XWiki Platform - XClass - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/pom.xml b/xwiki-platform-core/xwiki-platform-xml/pom.xml
index e4c4e45ad564..aa26246d2161 100644
--- a/xwiki-platform-core/xwiki-platform-xml/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml</artifactId>
   <name>XWiki Platform - XML - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
index 175d16ebe857..65861f5b8587 100644
--- a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xml</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml-script</artifactId>
   <name>XWiki Platform - XML - Script Service</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
index bda65e53f134..8915a45e42f2 100644
--- a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xml</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml-security</artifactId>
   <name>XWiki Platform - XML - Script Security</name>
diff --git a/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml b/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
index 6f2cafd82f2f..edea8d99e160 100644
--- a/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-zipexplorer</artifactId>
   <name>XWiki Platform - ZIP Explorer</name>
diff --git a/xwiki-platform-distribution/pom.xml b/xwiki-platform-distribution/pom.xml
index c336e4a97e52..23bfeb584fee 100644
--- a/xwiki-platform-distribution/pom.xml
+++ b/xwiki-platform-distribution/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution</artifactId>
   <name>XWiki Platform - Distribution - Parent POM</name>
@@ -219,18 +219,18 @@
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-appwithinminutes-ui</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
         <type>xar</type>
       </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-security-authorization-script</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-webjars-api</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
       </dependency>
       <!-- application-ckeditor-ui -->
       <dependency>
@@ -241,7 +241,7 @@
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-tree-webjar</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.1.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
index 8565505c4880..61f19e4ad1c4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian</artifactId>
   <name>XWiki Platform - Distribution - Debian</name>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-distribution-resources</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
index dc43c91f9eb3..467a14da2b13 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-common</artifactId>
   <packaging>deb</packaging>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-distribution-war</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>war</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
index 6cc0f76297fe..ef9a8788245a 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-mariadb-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - MariaDB - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
index b52b7d2cd99c..a71842f4dfe2 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-mysql-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - MySQL - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
index c7dd9bff072b..85239125a0b4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-pgsql-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Postgres SQL - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
index 8323a5e7cc97..d0d10d688e69 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
   <name>XWiki Platform - Distribution - Debian - Solr</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
index c88acf047b86..850dbd8150d7 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-all</artifactId>
   <packaging>deb</packaging>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
index 73e1e36877c4..f2e14d263c08 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-events</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
index eb837708ff4f..4c0bf62f00ac 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-extension_index</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
index f401d25844a6..b56eb7cdaaa5 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-ratings</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
index 4e175f1c152d..c645bf360d12 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-search</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
index b66fe9d4bb3b..47f64676a292 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
index 4888b09b5f3f..33b4c97619cd 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
index 1c14761df5b7..2d9075ffc166 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
index e0a07999f3ab..02b124ee4255 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
index d97812f956e9..c21be70caf1e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
index 39055a33180f..17464163d9fc 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
index a64e54706ad1..e07816f3f04d 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
index 44378a468574..1f65a44cd54e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
index c8745495511a..b3eed44a014f 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
index 48dbbbf4a9f4..cf5b6853d2be 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
index 2d74965f01b6..4e95efe27e33 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - Common</name>
@@ -41,14 +41,14 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tool-rootwebapp</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>war</type>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tool-jetty-resources</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.1.0-SNAPSHOT</version>
       <type>zip</type>
       <optional>true</optional>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
index b78cad80e5b7..f8fcd90fc4a6 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
index 4962d4d7f001..896b084f4806 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
index 8e950c771d42..45af79b023ec 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
index 8ce737d3032e..d3e576a6029d 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor</artifactId>
   <name>XWiki Platform - Distribution - Flavor</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
index 44bd895c7095..c96ec05ce520 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-common</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
index 9f292e8af3e1..dbc51651506e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-data</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Data</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
index 6cbadab17aab..a58030a83989 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-data</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-data-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Data - HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
index 09e1767ad103..e5d8273e4358 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-jetty-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Jetty HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
index 3ef7c0657277..19b58a7c1a29 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-mainwiki</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Main Wiki</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index f22ad55fa590..57e5f8c1fd2e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Parent POM</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
index 03ebb4863d24..3592223e6aa6 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-escaping</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Escaping</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
index ffca3d983c66..18e4094c41f5 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-misc</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Misc</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
index dc8a930811b5..b068bc0b0e45 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-pageobjects</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Page Objects test framework</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
index 41fc4f680c06..2f1754a71be4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-security</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Security</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
index 6ab71e7ae586..cd69c05a4237 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-storage</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Storage</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
index ba22926a6f28..b05ced666a96 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-ui</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - UI</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
index 4976b4b227bc..9f2812d5962b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
index 07ac63b1298e..67c04427538c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1011</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
index 88abe4d6297f..407bed76d88e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1110</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
index 55a6fa93b25a..9be073988951 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1210</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
index 6b46d7cb34dc..3e5ff772d15a 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1310</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
index e0f00a99f484..7b5cd1043b6c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1410</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
index 84d85578df75..0e0ce762489c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1510</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
index 23b083c73497..1ffdfa4f7ac5 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-84-filestore</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version} - Filestore</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
index b50e301ffea1..74d05754d1a0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-84</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
index 121206fb9471..41a62675b8a7 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-911</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
index f9a8ef7e8a06..b09475c7355e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-webstandards</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Web Standards</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
index 6f51f74106e3..4ed56d57e00c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-tour</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Tour</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
index 2fadada0f8de..7c4b6efbee0e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-wiki</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Wiki</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
index c09d14624cd3..5874d8a0b094 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-xip</artifactId>
   <name>XWiki Platform - Distribution - Flavor - XIP</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
index b1288ae39d98..d8355ce63c39 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-jetty-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Jetty HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
index ce247b71df7d..d1a71d14f75e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-resources</artifactId>
   <name>XWiki Platform - Distribution - XWiki Resources</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
index 51aa5d32e641..82918ac5b807 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui</artifactId>
   <name>XWiki Platform - Distribution - UI - Parent POM</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
index c1457ff33239..0e3bd8e181c0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-ui</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui-admin-user</artifactId>
   <name>XWiki Platform - Distribution - UI - Admin User</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
index 4f92befec3a8..3d82cdb168ef 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-ui</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui-base</artifactId>
   <name>XWiki Platform - Distribution - UI - Flavor Base</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
index 3bfad5aad72a..7218d1425285 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war-dependencies</artifactId>
   <name>XWiki Platform - Distribution - War - Dependencies</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
index 2f64f67b4eab..24f8efc97eaf 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war-legacydependencies</artifactId>
   <name>XWiki Platform - Distribution - War - Legacy Dependencies</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
index 625a6bef3a9b..77bd96f62662 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war</artifactId>
   <name>XWiki Platform - Distribution - War</name>
diff --git a/xwiki-platform-tools/pom.xml b/xwiki-platform-tools/pom.xml
index bbfa3abfa121..04f089ac160d 100644
--- a/xwiki-platform-tools/pom.xml
+++ b/xwiki-platform-tools/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tools</artifactId>
   <name>XWiki Platform - Tools - Parent POM</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
index 007c931eaf60..6414c412dbc1 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-configuration-resources</artifactId>
   <name>XWiki Platform - Tools - XWiki Configuration Resources</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
index 94ed77561424..09cc0c78c473 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty</artifactId>
   <name>XWiki Platform - Tools - Jetty - Parent POM</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
index 7a321867fae0..e2f720b73870 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tool-jetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty-listener</artifactId>
   <name>XWiki Platform - Tools - Jetty - Jetty Lifecycle Listener</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
index b7644a037d86..ad723e60dec6 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tool-jetty</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty-resources</artifactId>
   <name>XWiki Platform - Tools - Jetty - Jetty Configuration Resources</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
index a6c1dba326e8..8b0006352c78 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-packager-plugin</artifactId>
   <name>XWiki Platform - Tools - Packager</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
index 73c0b97b9c38..7894fa09909a 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-provision-plugin</artifactId>
   <name>XWiki Platform - Tools - Provision</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
index ef7ee83be98e..9fd744963f61 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-rootwebapp</artifactId>
   <packaging>war</packaging>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
index 8dc0e42946e0..5378d46b5c69 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-standards-validator</artifactId>
   <name>XWiki Platform - Tools - Web Standards Validator</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
index 0cb7ad9d4cad..8f5c08235077 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-xmldoc-update-plugin</artifactId>
   <name>XWiki Platform - Tools - XML Doc Update Plugin</name>

From 7b5c55237121828d067fe67a4065dbeda4581a04 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 23 Jan 2024 16:22:39 +0100
Subject: [PATCH 046/143] [branch] Updating inter-project dependencies on
 master

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97e55565620c..e036eb5df486 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.commons</groupId>
     <artifactId>xwiki-commons-pom</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.1.0-SNAPSHOT</version>
     <!-- Note: Do NOT set the <relativePath> tag here as this can cause issues. For example imagine you're using
          Jenkins and you have the following directory structure:
              workspace/xwiki-commons
@@ -35,7 +35,7 @@
          By using an empty value we force Maven to resolve the parent from the Maven repositories,
          see http://maven.apache.org/ref/3.2.3/maven-model/maven.html#class_parent
     -->
-    <relativePath />
+    <relativePath/>
   </parent>
   <groupId>org.xwiki.platform</groupId>
   <artifactId>xwiki-platform</artifactId>

From 0a66b1a899e8a2c334a2fb3379c6c9ff42d21dd5 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 24 Jan 2024 08:56:57 +0100
Subject: [PATCH 047/143] XWIKI-21825: Java 11 should be removed from accepted
 dependencies in the XWiki Debian package

---
 .../src/deb/control/control                                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/src/deb/control/control b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/src/deb/control/control
index 64bfaca9ba48..a0ed209e26b4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/src/deb/control/control
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/src/deb/control/control
@@ -4,7 +4,7 @@ Section: java
 Priority: optional
 Provides: xwiki
 Architecture: all
-Depends: ucf (>= 0.30), dbconfig-common (>= 1.8.0), openjdk-17-jre-headless | openjdk-11-jre-headless
+Depends: ucf (>= 0.30), dbconfig-common (>= 1.8.0), openjdk-17-jre-headless
 Conflicts: xwiki-enterprise-common
 Maintainer: [[debian.maintainer]]
 License: [[debian.license]]

From 16c79485cbd0f0e6bb75e98b37938ed6eb54a2a2 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 24 Jan 2024 13:16:37 +0100
Subject: [PATCH 048/143] XWIKI-21826: Upgrade to Selenium 4.17.0

---
 xwiki-platform-core/xwiki-platform-test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-test/pom.xml b/xwiki-platform-core/xwiki-platform-test/pom.xml
index 54d9df01b647..af9a041b2abd 100644
--- a/xwiki-platform-core/xwiki-platform-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/pom.xml
@@ -32,7 +32,7 @@
   <packaging>pom</packaging>
   <description>XWiki Platform - Test - Parent POM</description>
   <properties>
-    <selenium.version>4.16.1</selenium.version>
+    <selenium.version>4.17.0</selenium.version>
     <!-- Don't run backward-compatibility checks in test modules since we don't consider them as public APIs -->
     <xwiki.revapi.skip>true</xwiki.revapi.skip>
   </properties>

From f89c8f47fad6e5cc7e68c69a7e0acde07f5eed5a Mon Sep 17 00:00:00 2001
From: pjeanjean <pierre.jeanjean@xwiki.com>
Date: Tue, 16 Jan 2024 12:49:59 +0100
Subject: [PATCH 049/143] XWIKI-21611: Set right author when disabling/enabling
 an account

* Set only the original metadata author in XWikiUser.setDisabled
* Use the same disable/enable action everywhere
* Remove no longer needed request parameters
---
 .../com/xpn/xwiki/user/api/XWikiUser.java     |  17 +-
 .../com/xpn/xwiki/user/api/XWikiUserTest.java | 187 ++++++++++--------
 .../src/main/resources/templates/getusers.vm  |  18 +-
 3 files changed, 128 insertions(+), 94 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
index 3dca7c8da2c5..4013faff9e55 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
@@ -31,6 +31,8 @@
 import org.xwiki.model.reference.EntityReferenceSerializer;
 import org.xwiki.model.reference.LocalDocumentReference;
 import org.xwiki.model.reference.WikiReference;
+import org.xwiki.user.UserReference;
+import org.xwiki.user.UserReferenceResolver;
 
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
@@ -71,6 +73,8 @@ public class XWikiUser
 
     private ContextualLocalizationManager localization;
 
+    private UserReferenceResolver<DocumentReference> documentReferenceUserReferenceResolver;
+
     private Logger logger = LoggerFactory.getLogger(XWikiUser.class);
 
     private String fullName;
@@ -204,6 +208,15 @@ private EntityReferenceSerializer<String> getLocalEntityReferenceSerializer()
         return localEntityReferenceSerializer;
     }
 
+    private UserReferenceResolver<DocumentReference> getDocumentReferenceUserReferenceResolver()
+    {
+        if (this.documentReferenceUserReferenceResolver == null) {
+            this.documentReferenceUserReferenceResolver =
+                Utils.getComponent(UserReferenceResolver.TYPE_DOCUMENT_REFERENCE, "document");
+        }
+        return this.documentReferenceUserReferenceResolver;
+    }
+
     private ContextualLocalizationManager getLocalization()
     {
         if (this.localization == null) {
@@ -337,7 +350,9 @@ public void setDisabled(boolean disable, XWikiContext context)
                 XWikiDocument userdoc = getUserDocument(context);
                 userdoc.setIntValue(getUserClassReference(userdoc.getDocumentReference().getWikiReference()),
                     ACTIVE_PROPERTY, activeFlag);
-                userdoc.setAuthorReference(context.getUserReference());
+                UserReference userReference =
+                    getDocumentReferenceUserReferenceResolver().resolve(context.getUserReference());
+                userdoc.getAuthors().setOriginalMetadataAuthor(userReference);
                 context.getWiki().saveDocument(userdoc,
                     localizePlainOrKey("core.users." + (disable ? "disable" : "enable") + ".saveComment"), context);
             } catch (XWikiException e) {
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/user/api/XWikiUserTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/user/api/XWikiUserTest.java
index e9b48b0bf9ca..48cc43ef4eca 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/user/api/XWikiUserTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/user/api/XWikiUserTest.java
@@ -19,12 +19,17 @@
  */
 package com.xpn.xwiki.user.api;
 
+import javax.inject.Named;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.xwiki.localization.ContextualLocalizationManager;
+import org.xwiki.model.document.DocumentAuthors;
 import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.test.junit5.mockito.MockComponent;
 import org.xwiki.test.mockito.MockitoComponentManager;
+import org.xwiki.user.UserReferenceResolver;
 
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiDocument;
@@ -56,21 +61,29 @@ public class XWikiUserTest
     @InjectMockitoOldcore
     private MockitoOldcore mockitoOldcore;
 
+    @MockComponent
+    @Named("document")
+    private UserReferenceResolver<DocumentReference> documentReferenceUserReferenceResolver;
+
     @Mock
     private XWikiDocument userDocument;
 
-    private DocumentReference userClassReference = new DocumentReference("xwiki", "XWiki", "XWikiUsers");
+    @Mock
+    private DocumentAuthors authors;
+
+    private final DocumentReference userClassReference = new DocumentReference("xwiki", "XWiki", "XWikiUsers");
 
-    private DocumentReference userReference = new DocumentReference("xwiki", "XWiki", "Foo");
+    private final DocumentReference userReference = new DocumentReference("xwiki", "XWiki", "Foo");
 
     @BeforeEach
     public void setup(MockitoComponentManager componentManager) throws Exception
     {
-        when(mockitoOldcore.getSpyXWiki().getDocument(userReference, mockitoOldcore.getXWikiContext()))
-            .thenReturn(userDocument);
-        when(userDocument.getDocumentReference()).thenReturn(userReference);
-        when(userDocument.getDocumentReferenceWithLocale()).thenReturn(userReference);
-        when(userDocument.clone()).thenReturn(userDocument);
+        when(this.mockitoOldcore.getSpyXWiki().getDocument(this.userReference, this.mockitoOldcore.getXWikiContext()))
+            .thenReturn(this.userDocument);
+        when(this.userDocument.getDocumentReference()).thenReturn(this.userReference);
+        when(this.userDocument.getDocumentReferenceWithLocale()).thenReturn(this.userReference);
+        when(this.userDocument.getAuthors()).thenReturn(this.authors);
+        when(this.userDocument.clone()).thenReturn(this.userDocument);
         componentManager.registerMockComponent(ContextualLocalizationManager.class, "default");
     }
 
@@ -95,38 +108,42 @@ public void createWithNullFullName()
     @Test
     public void isDisabled()
     {
-        XWikiUser user = new XWikiUser(userReference);
-        when(userDocument.getIntValue(userClassReference, XWikiUser.ACTIVE_PROPERTY, 1)).thenReturn(1);
-        assertFalse(user.isDisabled(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        when(this.userDocument.getIntValue(this.userClassReference, XWikiUser.ACTIVE_PROPERTY, 1)).thenReturn(1);
+        assertFalse(user.isDisabled(this.mockitoOldcore.getXWikiContext()));
 
-        when(userDocument.getIntValue(userClassReference, XWikiUser.ACTIVE_PROPERTY, 1)).thenReturn(0);
-        assertTrue(user.isDisabled(mockitoOldcore.getXWikiContext()));
+        when(this.userDocument.getIntValue(this.userClassReference, XWikiUser.ACTIVE_PROPERTY, 1)).thenReturn(0);
+        assertTrue(user.isDisabled(this.mockitoOldcore.getXWikiContext()));
 
         user = new XWikiUser((DocumentReference) null);
-        assertFalse(user.isDisabled(mockitoOldcore.getXWikiContext()));
+        assertFalse(user.isDisabled(this.mockitoOldcore.getXWikiContext()));
 
         user = new XWikiUser(XWikiRightService.SUPERADMIN_USER_FULLNAME);
-        assertFalse(user.isDisabled(mockitoOldcore.getXWikiContext()));
+        assertFalse(user.isDisabled(this.mockitoOldcore.getXWikiContext()));
     }
 
     @Test
     public void setDisabledFalseNormalUser() throws XWikiException
     {
-        XWikiUser user = new XWikiUser(userReference);
-        user.setDisabled(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, times(1)).setIntValue(userClassReference, XWikiUser.ACTIVE_PROPERTY, 1);
-        verify(mockitoOldcore.getSpyXWiki(), times(1))
-            .saveDocument(same(userDocument), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        user.setDisabled(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, times(1)).setIntValue(this.userClassReference, XWikiUser.ACTIVE_PROPERTY, 1);
+        verify(this.mockitoOldcore.getSpyXWiki(), times(1))
+            .saveDocument(same(this.userDocument), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+        verify(this.authors, times(1)).setOriginalMetadataAuthor(any());
+        verify(this.authors, never()).setEffectiveMetadataAuthor(any());
     }
 
     @Test
     public void setDisabledTrueNormalUser() throws XWikiException
     {
-        XWikiUser user = new XWikiUser(userReference);
-        user.setDisabled(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, times(1)).setIntValue(userClassReference, XWikiUser.ACTIVE_PROPERTY, 0);
-        verify(mockitoOldcore.getSpyXWiki(), times(1))
-            .saveDocument(same(userDocument), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        user.setDisabled(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, times(1)).setIntValue(this.userClassReference, XWikiUser.ACTIVE_PROPERTY, 0);
+        verify(this.mockitoOldcore.getSpyXWiki(), times(1))
+            .saveDocument(same(this.userDocument), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+        verify(this.authors, times(1)).setOriginalMetadataAuthor(any());
+        verify(this.authors, never()).setEffectiveMetadataAuthor(any());
     }
 
     @Test
@@ -134,68 +151,68 @@ public void setDisabledGuestOrSuperadminUser() throws XWikiException
     {
         // With guest user we never save anything
         XWikiUser user = new XWikiUser((DocumentReference) null);
-        user.setDisabled(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
-
-        user.setDisabled(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        user.setDisabled(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+
+        user.setDisabled(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
 
         // With superadmin user we never save anything
         user = new XWikiUser(XWikiRightService.SUPERADMIN_USER_FULLNAME);
-        user.setDisabled(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
-
-        user.setDisabled(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        user.setDisabled(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+
+        user.setDisabled(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
     }
 
     @Test
     public void isEmailChecked()
     {
-        XWikiUser user = new XWikiUser(userReference);
-        when(userDocument.getIntValue(userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1)).thenReturn(1);
-        assertTrue(user.isEmailChecked(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        when(this.userDocument.getIntValue(this.userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1)).thenReturn(1);
+        assertTrue(user.isEmailChecked(this.mockitoOldcore.getXWikiContext()));
 
-        when(userDocument.getIntValue(userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1)).thenReturn(0);
-        assertFalse(user.isEmailChecked(mockitoOldcore.getXWikiContext()));
+        when(this.userDocument.getIntValue(this.userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1)).thenReturn(0);
+        assertFalse(user.isEmailChecked(this.mockitoOldcore.getXWikiContext()));
 
         user = new XWikiUser((DocumentReference) null);
-        assertTrue(user.isEmailChecked(mockitoOldcore.getXWikiContext()));
+        assertTrue(user.isEmailChecked(this.mockitoOldcore.getXWikiContext()));
 
         user = new XWikiUser(XWikiRightService.SUPERADMIN_USER_FULLNAME);
-        assertTrue(user.isEmailChecked(mockitoOldcore.getXWikiContext()));
+        assertTrue(user.isEmailChecked(this.mockitoOldcore.getXWikiContext()));
     }
 
     @Test
     public void setEmailCheckedFalseNormalUser() throws XWikiException
     {
-        XWikiUser user = new XWikiUser(userReference);
-        user.setEmailChecked(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, times(1)).setIntValue(userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 0);
-        verify(mockitoOldcore.getSpyXWiki(), times(1))
-            .saveDocument(same(userDocument), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        user.setEmailChecked(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, times(1)).setIntValue(this.userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 0);
+        verify(this.mockitoOldcore.getSpyXWiki(), times(1))
+            .saveDocument(same(this.userDocument), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
     }
 
     @Test
     public void setEmailCheckedTrueNormalUser() throws XWikiException
     {
-        XWikiUser user = new XWikiUser(userReference);
-        user.setEmailChecked(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, times(1)).setIntValue(userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1);
-        verify(mockitoOldcore.getSpyXWiki(), times(1))
-            .saveDocument(same(userDocument), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        XWikiUser user = new XWikiUser(this.userReference);
+        user.setEmailChecked(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, times(1)).setIntValue(this.userClassReference, XWikiUser.EMAIL_CHECKED_PROPERTY, 1);
+        verify(this.mockitoOldcore.getSpyXWiki(), times(1))
+            .saveDocument(same(this.userDocument), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
     }
 
     @Test
@@ -203,30 +220,30 @@ public void setEmailCheckedGuestOrSuperadminUser() throws XWikiException
     {
         // With guest user we never save anything
         XWikiUser user = new XWikiUser((DocumentReference) null);
-        user.setEmailChecked(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
-
-        user.setEmailChecked(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        user.setEmailChecked(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+
+        user.setEmailChecked(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
 
         // With superadmin user we never save anything
         user = new XWikiUser(XWikiRightService.SUPERADMIN_USER_FULLNAME);
-        user.setEmailChecked(true, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
-
-        user.setEmailChecked(false, mockitoOldcore.getXWikiContext());
-        verify(userDocument, never())
-            .setIntValue(same(userClassReference), any(String.class), any(Integer.class));
-        verify(mockitoOldcore.getSpyXWiki(), never())
-            .saveDocument(any(XWikiDocument.class), any(String.class), same(mockitoOldcore.getXWikiContext()));
+        user.setEmailChecked(true, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
+
+        user.setEmailChecked(false, this.mockitoOldcore.getXWikiContext());
+        verify(this.userDocument, never())
+            .setIntValue(same(this.userClassReference), any(String.class), any(Integer.class));
+        verify(this.mockitoOldcore.getSpyXWiki(), never())
+            .saveDocument(any(XWikiDocument.class), any(String.class), same(this.mockitoOldcore.getXWikiContext()));
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm
index 9fbfe0de81d0..62ecfb2416ea 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm
@@ -128,16 +128,18 @@
       'doc_hasdelete': $hasDelete,
       'doc_delete_url': $user.getURL('delete'),
       'doc_hasdisable': $hasDisable,
-      'doc_disable_url': $user.getURL('save', $escapetool.url({
-        "${userClassName}_0_active": 0,
-        'comment': $services.localization.render('core.users.disable.saveComment'),
-        'form_token': $services.csrf.token
+      'doc_disable_url': $xwiki.getURL('XWiki.XWikiUserProfileSheet', 'get', $escapetool.url({
+        'outputSyntax': 'plain',
+        'action': 'disable',
+        'userId': $user.documentReference,
+        'csrf': $services.csrf.token
       })),
       'doc_hasenable': $hasEnable,
-      'doc_enable_url': $user.getURL('save', $escapetool.url({
-        "${userClassName}_0_active": 1,
-        'comment': $services.localization.render('core.users.enable.saveComment'),
-        'form_token': $services.csrf.token
+      'doc_enable_url': $xwiki.getURL('XWiki.XWikiUserProfileSheet', 'get', $escapetool.url({
+        'outputSyntax': 'plain',
+        'action': 'enable',
+        'userId': $user.documentReference,
+        'csrf': $services.csrf.token
       })),
       'name': "#displayUserAliasWithAvatar($user.documentReference $disabled)",
       'first_name': $userObject.getValue('first_name'),

From 910a5018a50039e8b24556573dfe342f143ef949 Mon Sep 17 00:00:00 2001
From: pjeanjean <pierre.jeanjean@xwiki.com>
Date: Tue, 16 Jan 2024 15:10:35 +0100
Subject: [PATCH 050/143] XWIKI-19611: Improve filename escaping in attachment
 upload

* Use escapeHTML() when displaying filenames in upload.js
* Add a test in AttachmentIT to check for proper HTML escaping during upload
---
 .../flamingo/test/docker/AttachmentIT.java    | 19 +++++++++++++++++++
 .../<strong>EscapedAttachment.txt             |  1 +
 .../resources/uicomponents/widgets/upload.js  | 11 ++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/resources/AttachmentIT/<strong>EscapedAttachment.txt

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/AttachmentIT.java b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/AttachmentIT.java
index 1431b45191b2..29d45ae241e9 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/AttachmentIT.java
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/AttachmentIT.java
@@ -65,6 +65,8 @@ class AttachmentIT
 
     private static final String SECOND_ATTACHMENT = "SmallAttachment2.txt";
 
+    private static final String ESCAPED_ATTACHMENT = "<strong>EscapedAttachment.txt";
+
     private static final String IMAGE_ATTACHMENT = "image.gif";
 
     private static final String SMALL_SIZE_ATTACHMENT = "SmallSizeAttachment.png";
@@ -441,6 +443,23 @@ void deleteAttachmentWithSpecialChar(TestUtils setup, TestReference testReferenc
                 basePage.getXWikiMessageContent());
     }
 
+    @Test
+    @Order(9)
+    void checkEscapingInAttachmentName(TestUtils setup, TestReference testReference,
+        TestConfiguration testConfiguration)
+    {
+        setup.loginAsSuperAdmin();
+        setup.createPage(testReference, "Empty content");
+        AttachmentsPane attachmentsPane = new AttachmentsViewPage().openAttachmentsDocExtraPane();
+
+        attachmentsPane.setFileToUpload(getFileToUpload(testConfiguration, ESCAPED_ATTACHMENT).getAbsolutePath());
+        attachmentsPane.waitForUploadToFinish(ESCAPED_ATTACHMENT);
+        attachmentsPane.clickHideProgress();
+
+        assertTrue(attachmentsPane.attachmentExistsByFileName(ESCAPED_ATTACHMENT));
+        attachmentsPane.deleteAttachmentByFileByName(ESCAPED_ATTACHMENT);
+    }
+
     private String getAttachmentsMacroContent(DocumentReference docRef)
     {
         StringBuilder sb = new StringBuilder();
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/resources/AttachmentIT/<strong>EscapedAttachment.txt b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/resources/AttachmentIT/<strong>EscapedAttachment.txt
new file mode 100644
index 000000000000..3cfe87304cd3
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/resources/AttachmentIT/<strong>EscapedAttachment.txt
@@ -0,0 +1 @@
+This is an attachment whose name should be escaped.
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/upload.js b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/upload.js
index adfe41a5f091..7203cb10be14 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/upload.js
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/widgets/upload.js
@@ -124,7 +124,7 @@ var XWiki = (function(XWiki) {
 
       if (this.options.enableFileInfo) {
         statusUI.FILE_INFO   = UploadUtils.createDiv('file-info');
-        (statusUI.FILE_NAME  = UploadUtils.createSpan('file-name', this.file.name)).title = this.file.type;
+        (statusUI.FILE_NAME  = UploadUtils.createSpan('file-name', this.file.name.escapeHTML())).title = this.file.type;
         statusUI.FILE_SIZE   = UploadUtils.createSpan('file-size', ' (' + UploadUtils.bytesToSize(this.file.size) + ')');
         statusUI.FILE_CANCEL = UploadUtils.createButton("$services.localization.render('core.widgets.html5upload.item.cancel')", this.cancelUpload.bindAsEventListener(this));
         // TODO MIME type icon?
@@ -295,7 +295,7 @@ var XWiki = (function(XWiki) {
         this.statusUI.FILE_CANCEL.addClassName('hidden');
       }
       this.formData.input.fire('xwiki:html5upload:message', {content: 'UPLOAD_FINISHING', type: 'inprogress', source: this,
-        parameters : {name : this.file.name}
+        parameters : {name : this.file.name.escapeHTML()}
       });
     },
 
@@ -324,7 +324,7 @@ var XWiki = (function(XWiki) {
         }
       }
       this.formData.input.fire('xwiki:html5upload:message', {content: 'UPLOAD_FINISHED', type: 'done', source: this,
-        parameters : {name : this.file.name, size : UploadUtils.bytesToSize(this.file.size)}
+        parameters : {name : this.file.name.escapeHTML(), size : UploadUtils.bytesToSize(this.file.size)}
       });
       this.formData.input.fire('xwiki:html5upload:fileFinished', {source: this});
       clearInterval(this.timer);
@@ -354,7 +354,8 @@ var XWiki = (function(XWiki) {
      */
     abnormalUploadFinish : function (message) {
       clearInterval(this.timer);
-      this.formData.input.fire('xwiki:html5upload:message', {content: message, type: 'error', source: this, parameters : {name : this.file.name}});
+      this.formData.input.fire('xwiki:html5upload:message', {content: message, type: 'error', source: this, parameters :
+       {name : this.file.name.escapeHTML()}});
       this.formData.input.fire('xwiki:html5upload:fileFinished', {source: this});
     }
   });
@@ -517,7 +518,7 @@ var XWiki = (function(XWiki) {
           }
         } catch (ex) {
           this.showMessage(ex, 'error', {size : UploadUtils.bytesToSize(this.options && this.options.maxFilesize),
-                                         name : file.name, type: file.type
+                                         name : file.name.escapeHTML(), type: file.type
           });
         }
       }

From ec18f3ab4e9463749cfe43c29d481a6a7bb5a3cc Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 18 Jan 2024 11:15:00 +0100
Subject: [PATCH 051/143] XWIKI-21810: Improve suggest URL escaping in
 StringClass

---
 .../xwiki/objects/classes/StringClass.java    | 56 +++++++++----
 .../objects/classes/StringClassTest.java      | 81 +++++++++++++++++++
 2 files changed, 120 insertions(+), 17 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
index adbece77ccb9..6b670225a02d 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
@@ -19,7 +19,11 @@
  */
 package com.xpn.xwiki.objects.classes;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.apache.ecs.xhtml.input;
+import org.xwiki.velocity.tools.EscapeTool;
 import org.xwiki.xml.XMLUtils;
 
 import com.xpn.xwiki.XWiki;
@@ -30,6 +34,8 @@
 import com.xpn.xwiki.objects.StringProperty;
 import com.xpn.xwiki.objects.meta.PropertyMetaClass;
 
+import static org.apache.commons.lang.StringEscapeUtils.escapeJavaScript;
+
 public class StringClass extends PropertyClass
 {
     private static final long serialVersionUID = 1L;
@@ -89,7 +95,8 @@ public BaseProperty newProperty()
     }
 
     @Override
-    public void displayEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context)
+    public void displayEdit(StringBuffer buffer, String name, String prefix, BaseCollection object,
+        XWikiContext context)
     {
         input input = new input();
         input.setAttributeFilter(new XMLAttributeValueFilter());
@@ -105,23 +112,9 @@ public void displayEdit(StringBuffer buffer, String name, String prefix, BaseCol
         input.setDisabled(isDisabled());
 
         if (isPicker()) {
-            input.setClass("suggested");
-            String path = "";
-            XWiki xwiki = context.getWiki();
-            path = xwiki.getURL("Main.WebHome", "view", context);
-
-            String classname = this.getObject().getName();
-            String fieldname = this.getName();
-            String secondCol = "-", firstCol = "-";
-
-            String script =
-                "\"" + path + "?xpage=suggest&classname=" + classname + "&fieldname=" + fieldname + "&firCol="
-                    + firstCol + "&secCol=" + secondCol + "&\"";
-            String varname = "\"input\"";
-            input.setOnFocus("new ajaxSuggest(this, {script:" + script + ", varname:" + varname + "} )");
+            displayPickerEdit(input);
         }
-
-        buffer.append(input.toString());
+        buffer.append(input);
     }
 
     @Override
@@ -133,4 +126,33 @@ public void displayView(StringBuffer buffer, String name, String prefix, BaseCol
             buffer.append(XMLUtils.escapeElementText(property.toText()));
         }
     }
+
+    private void displayPickerEdit(input input)
+    {
+        input.setClass("suggested");
+        XWikiContext xWikiContext = getXWikiContext();
+        XWiki xwiki = xWikiContext.getWiki();
+        String path = xwiki.getURL("Main.WebHome", "view", xWikiContext);
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(path);
+        stringBuilder.append('?');
+        stringBuilder.append(new EscapeTool().url(getParametersMap()));
+        stringBuilder.append('&');
+        input.setOnFocus(String.format("new ajaxSuggest(this, {script:\"%s\", varname:\"input\"} )",
+            escapeJavaScript(stringBuilder.toString())));
+    }
+
+    private Map<String, String> getParametersMap()
+    {
+        String dash = "-";
+        // Using a linked hash map to keep the order of the keys stable when generating the query parameters, which 
+        // is especially handy for testing, but could be useful in other scenarios.
+        Map<String, String> parameters = new LinkedHashMap<>();
+        parameters.put("xpage", "suggest");
+        parameters.put("classname", getObject().getName());
+        parameters.put("fieldname", getName());
+        parameters.put("firCol", dash);
+        parameters.put("secCol", dash);
+        return parameters;
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java
new file mode 100644
index 000000000000..7a564f4c214a
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java
@@ -0,0 +1,81 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package com.xpn.xwiki.objects.classes;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.xwiki.model.reference.DocumentReference;
+
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.test.MockitoOldcore;
+import com.xpn.xwiki.test.component.XWikiDocumentFilterUtilsComponentList;
+import com.xpn.xwiki.test.junit5.mockito.InjectMockitoOldcore;
+import com.xpn.xwiki.test.junit5.mockito.OldcoreTest;
+import com.xpn.xwiki.web.XWikiURLFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test of {@link StringClass}.
+ *
+ * @version $Id$
+ */
+@OldcoreTest
+@XWikiDocumentFilterUtilsComponentList
+class StringClassTest
+{
+    @InjectMockitoOldcore
+    private MockitoOldcore oldCore;
+
+    @Mock
+    private XWikiURLFactory urlFactory;
+
+    @Test
+    void displayEdit()
+    {
+        XWikiContext xWikiContext = this.oldCore.getXWikiContext();
+        xWikiContext.setURLFactory(this.urlFactory);
+        when(this.oldCore.getSpyXWiki().getURL("Main.WebHome", "view", xWikiContext)).thenReturn("/a/b");
+
+        String fieldName = "test";
+        String spaceName = "\" + alert(1) + \"";
+        String pageName = "WebHome";
+        StringClass stringClass = new StringClass();
+        stringClass.setPicker(true);
+        BaseClass baseClass = new BaseClass();
+        stringClass.setObject(baseClass);
+        baseClass.setDocumentReference(
+            new DocumentReference(this.oldCore.getXWikiContext().getWikiId(), spaceName, pageName));
+        stringClass.setName(fieldName);
+        StringBuffer stringBuffer = new StringBuffer();
+        stringClass.displayEdit(stringBuffer, fieldName, spaceName + "." + pageName + "_0_", baseClass,
+            xWikiContext);
+        assertEquals("<input " 
+            + "onfocus='new ajaxSuggest(this, &#123;script:&#34;\\/a\\/b?xpage=suggest&#38;" 
+            + "classname=%22%20%2B%20alert%281%29%20%2B%20%22.WebHome&#38;fieldname=test&#38;firCol=-&#38;" 
+            + "secCol=-&#38;&#34;, varname:&#34;input&#34;} )' " 
+            + "size='30' " 
+            + "id='&#34; + alert(1) + &#34;.WebHome_0_test' " 
+            + "class='suggested' " 
+            + "name='&#34; + alert(1) + &#34;.WebHome_0_test' " 
+            + "type='text'/>", stringBuffer.toString());
+    }
+}

From 22047dfbc5603dc5943e09910e51736089ae8041 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 25 Jan 2024 09:20:04 +0100
Subject: [PATCH 052/143] XWIKI-21813: Migrate to CSS3 parsing (#2806)

---
 .../org/xwiki/rendering/internal/wiki/XWikiWikiModel.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java
index ad523090e9f7..8b9a52390ad3 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java
@@ -58,7 +58,7 @@
 import org.xwiki.rendering.wiki.WikiModelException;
 
 import com.steadystate.css.parser.CSSOMParser;
-import com.steadystate.css.parser.SACParserCSS21;
+import com.steadystate.css.parser.SACParserCSS3;
 
 /**
  * Implementation using the Document Access Bridge ({@link DocumentAccessBridge}).
@@ -134,7 +134,7 @@ public class XWikiWikiModel implements WikiModel
      *
      * @see <a href="https://jira.xwiki.org/browse/XWIKI-5625">XWIKI-5625: PDF styling doesn't work anymore</a>
      */
-    private final CSSOMParser cssParser = new CSSOMParser(new SACParserCSS21());
+    private final CSSOMParser cssParser = new CSSOMParser(new SACParserCSS3());
 
     /**
      * {@inheritDoc}

From a879aae17e6ead1cd9d30d9233c62dcb33481466 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Thu, 25 Jan 2024 13:54:31 +0100
Subject: [PATCH 053/143] [misc] Improve documentation

---
 .../src/main/resources/xwiki.properties.vm                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
index 9e74537943db..5d557587dfb3 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm
@@ -573,8 +573,8 @@ extension.repositories = $extensionRepository
 #-# [Since 2.5]
 #-# The directory where extensions are stored after being downloaded.
 #-#
-#-# The default is <environment.permanentDirectory path>/extension/repository.
-# extension.localRepository=extension/repository
+#-# The default is {environment.permanentDirectory}/extension/repository.
+# extension.localRepository=/var/lib/xwiki/data/extension/repository
 
 #-# [Since 3.4]
 #-# The user agent to use when communication with external services (generally repositories).

From 6a73d7029bb8ea42d5a220fec78d9ac96e160854 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Thu, 25 Jan 2024 14:56:23 +0100
Subject: [PATCH 054/143] XWIKI-21795: Old Event Listener Realized as Wiki
 Component Left Over When Renaming Listener XWIKI-21830: The role hint and
 type priorities are not taken into account in wiki component

---
 .../internal/DefaultWikiComponentManager.java | 12 ++--
 .../wiki/DefaultWikiComponentManagerTest.java | 67 ++++++++++++-------
 .../component/wiki/TestImplementation.java    | 20 +++++-
 3 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/main/java/org/xwiki/component/wiki/internal/DefaultWikiComponentManager.java b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/main/java/org/xwiki/component/wiki/internal/DefaultWikiComponentManager.java
index 7b89504ac528..0c48a9d24522 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/main/java/org/xwiki/component/wiki/internal/DefaultWikiComponentManager.java
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/main/java/org/xwiki/component/wiki/internal/DefaultWikiComponentManager.java
@@ -93,7 +93,7 @@ public void registerWikiComponent(WikiComponent component) throws WikiComponentE
             // Get the component role interface
             Type roleType = component.getRoleType();
             Class< ? > roleTypeClass = ReflectionUtils.getTypeClass(roleType);
-            ComponentDescriptor componentDescriptor = createComponentDescriptor(roleType, component.getRoleHint());
+            ComponentDescriptor componentDescriptor = createComponentDescriptor(roleType, component);
 
             // Set the proper information so the component manager use the proper keys to find components to register
             this.wikiComponentManagerContext.setCurrentUserReference(component.getAuthorReference());
@@ -217,14 +217,18 @@ private ComponentManager getComponentManager(WikiComponentScope scope) throws Co
      * Helper method to create a component descriptor from role and hint.
      * 
      * @param roleType the component role type of the descriptor to create
-     * @param roleHint the hint of the implementation for the descriptor to create
+     * @param component the component for which to create a descriptor
      * @return the constructed {@link ComponentDescriptor}
      */
-    private ComponentDescriptor createComponentDescriptor(Type roleType, String roleHint)
+    private ComponentDescriptor createComponentDescriptor(Type roleType, WikiComponent component)
     {
         DefaultComponentDescriptor cd = new DefaultComponentDescriptor();
         cd.setRoleType(roleType);
-        cd.setRoleHint(roleHint);
+        cd.setRoleHint(component.getRoleHint());
+        cd.setImplementation(component.getClass());
+        cd.setRoleHintPriority(component.getRoleHintPriority());
+        cd.setRoleTypePriority(component.getRoleTypePriority());
+
         return cd;
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/DefaultWikiComponentManagerTest.java b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/DefaultWikiComponentManagerTest.java
index 395a56d27d86..cb41a2a53d7c 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/DefaultWikiComponentManagerTest.java
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/DefaultWikiComponentManagerTest.java
@@ -19,69 +19,88 @@
  */
 package org.xwiki.component.wiki;
 
-import org.junit.Rule;
-import org.junit.Test;
+import javax.inject.Named;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 import org.xwiki.component.descriptor.ComponentDescriptor;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.wiki.internal.DefaultWikiComponentManager;
 import org.xwiki.component.wiki.internal.WikiComponentManagerContext;
 import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.test.mockito.MockitoComponentMockingRule;
+import org.xwiki.test.junit5.mockito.ComponentTest;
+import org.xwiki.test.junit5.mockito.InjectMockComponents;
+import org.xwiki.test.junit5.mockito.MockComponent;
 
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for {@link DefaultWikiComponentManager}.
  *
  * @version $Id$
  */
-public class DefaultWikiComponentManagerTest
+@ComponentTest
+class DefaultWikiComponentManagerTest
 {
     private static final DocumentReference DOC_REFERENCE = new DocumentReference("xwiki", "XWiki", "MyComponent");
 
     private static final DocumentReference AUTHOR_REFERENCE = new DocumentReference("xwiki", "XWiki", "Admin");
 
-    @Rule
-    public MockitoComponentMockingRule<DefaultWikiComponentManager> mocker = new MockitoComponentMockingRule<>(
-        DefaultWikiComponentManager.class);
+    @InjectMockComponents
+    private DefaultWikiComponentManager manager;
+
+    @MockComponent
+    private WikiComponentManagerContext wcmc;
+
+    @MockComponent
+    @Named("wiki")
+    private ComponentManager wikiComponentManager;
 
     @Test
-    public void registerAndUnregisterWikiComponent() throws Exception
+    void registerAndUnregisterWikiComponent() throws Exception
     {
-        WikiComponentManagerContext wcmc = this.mocker.getInstance(WikiComponentManagerContext.class);
-        when(wcmc.getCurrentEntityReference()).thenReturn(DOC_REFERENCE);
-        when(wcmc.getCurrentUserReference()).thenReturn(AUTHOR_REFERENCE);
-
-        WikiComponent component = new TestImplementation(DOC_REFERENCE, AUTHOR_REFERENCE, WikiComponentScope.WIKI);
+        when(this.wcmc.getCurrentEntityReference()).thenReturn(DOC_REFERENCE);
+        when(this.wcmc.getCurrentUserReference()).thenReturn(AUTHOR_REFERENCE);
 
-        ComponentManager wikiComponentManager = this.mocker.registerMockComponent(ComponentManager.class, "wiki");
+        WikiComponent component =
+            new TestImplementation(DOC_REFERENCE, AUTHOR_REFERENCE, WikiComponentScope.WIKI, 42, 43);
 
         // Register the wiki component
-        this.mocker.getComponentUnderTest().registerWikiComponent(component);
+        this.manager.registerWikiComponent(component);
 
         // Test 1: we verify that the component has been registered against the CM
-        verify(wikiComponentManager, times(1)).registerComponent(any(ComponentDescriptor.class), eq(component));
+        ArgumentCaptor<ComponentDescriptor> componentCaoptor = ArgumentCaptor.forClass(ComponentDescriptor.class);
+        verify(this.wikiComponentManager, times(1)).registerComponent(componentCaoptor.capture(), eq(component));
+        assertEquals(TestRole.class, componentCaoptor.getValue().getRoleType());
+        assertEquals("roleHint", componentCaoptor.getValue().getRoleHint());
+        assertEquals(42, componentCaoptor.getValue().getRoleTypePriority());
+        assertEquals(43, componentCaoptor.getValue().getRoleHintPriority());
+        assertEquals(TestImplementation.class, componentCaoptor.getValue().getImplementation());
 
         // Try to register the wiki component again
-        this.mocker.getComponentUnderTest().registerWikiComponent(component);
+        this.manager.registerWikiComponent(component);
 
         // Test 2: we verify that the component has been registered again against the CM
-        verify(wikiComponentManager, times(2)).registerComponent(any(ComponentDescriptor.class), eq(component));
+        verify(this.wikiComponentManager, times(2)).registerComponent(any(ComponentDescriptor.class), eq(component));
 
         // Unregister the wiki component
-        this.mocker.getComponentUnderTest().unregisterWikiComponents(DOC_REFERENCE);
+        this.manager.unregisterWikiComponents(DOC_REFERENCE);
 
         // Test 3: we verify that the component has been unregistered from the CM
         // Note that indirectly this tests that the wiki component has been added to the wiki component cache during
         // the call to registerWikiComponent()
-        verify(wikiComponentManager, times(1)).unregisterComponent(TestRole.class, "roleHint");
+        verify(this.wikiComponentManager, times(1)).unregisterComponent(TestRole.class, "roleHint");
 
         // Try to unregister the wiki component again
-        this.mocker.getComponentUnderTest().unregisterWikiComponents(DOC_REFERENCE);
+        this.manager.unregisterWikiComponents(DOC_REFERENCE);
 
         // Test 4: We verify that nothing happens on the CM since the wiki component is not in the wiki cache.
         // Note: the times(1) comes from the previous call in test 2 above.
-        verify(wikiComponentManager, times(1)).unregisterComponent(TestRole.class, "roleHint");
+        verify(this.wikiComponentManager, times(1)).unregisterComponent(TestRole.class, "roleHint");
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/TestImplementation.java b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/TestImplementation.java
index f80ccb5280ba..c38ac8f64c36 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/TestImplementation.java
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/src/test/java/org/xwiki/component/wiki/TestImplementation.java
@@ -36,12 +36,18 @@ public class TestImplementation implements TestRole, WikiComponent
 
     private WikiComponentScope scope;
 
+    private int roleTypePriority;
+
+    private int roleHintPriority;
+
     public TestImplementation(DocumentReference documentReference, DocumentReference authorReference,
-        WikiComponentScope scope)
+        WikiComponentScope scope, int roleTypePriority, int roleHintPriority)
     {
         this.documentReference = documentReference;
         this.authorReference = authorReference;
         this.scope = scope;
+        this.roleTypePriority = roleTypePriority;
+        this.roleHintPriority = roleHintPriority;
     }
 
     @Override
@@ -79,4 +85,16 @@ public WikiComponentScope getScope()
     {
         return this.scope;
     }
+
+    @Override
+    public int getRoleHintPriority()
+    {
+        return this.roleHintPriority;
+    }
+
+    @Override
+    public int getRoleTypePriority()
+    {
+        return this.roleTypePriority;
+    }
 }

From a27a34b631b31405dd7cc2ab87617b6c5d6ed318 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Mon, 22 Jan 2024 16:09:44 +0100
Subject: [PATCH 055/143] [Misc] xar:format

---
 .../XWiki/Notifications/Code/NotificationsDisplayerUIX.xml      | 2 +-
 .../main/resources/XWiki/Notifications/Code/Translations.ko.xml | 2 +-
 .../main/resources/XWiki/Notifications/Code/Translations.uk.xml | 2 +-
 .../src/main/resources/TourCode/TourTranslations.ko.xml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsDisplayerUIX.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsDisplayerUIX.xml
index cb28f65e641b..d104be7d6216 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsDisplayerUIX.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsDisplayerUIX.xml
@@ -797,7 +797,7 @@ require(['jquery', 'xwiki-meta', 'xwiki-bootstrap-switch'], function ($, xm) {
  * Notifications Header
  ***********************************************/
 #tmNotifications {
-  &amp; > button {
+  &amp; &gt; button {
     background-color: @navbar-default-bg;
     color: @navbar-default-link-color;
     border: 0;
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml
index 253d5b6aa8cd..bcdc051060db 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml
@@ -260,4 +260,4 @@ notifications.filters.type.exclusive=독점적인
 ## Used to indicate where deprecated keys end
 #@deprecatedend
 </content>
-  </xwikidoc>
+</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.uk.xml
index 4597fa88c50a..145a6d2a2b50 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.uk.xml
@@ -260,4 +260,4 @@ notifications.filters.type.exclusive=Виключно
 ## Used to indicate where deprecated keys end
 #@deprecatedend
 </content>
-  </xwikidoc>
+</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.ko.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.ko.xml
index d61d1b5da795..8408ee1c84af 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.ko.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.ko.xml
@@ -98,4 +98,4 @@ tour.upgrade.successNothing=업그레이드할 것이 없습니다!
 tour.template.name=관광
 tour.template.description=단계별 투어
 </content>
-  </xwikidoc>
+</xwikidoc>

From 049871115da41d56e29bc7610ae6252c6ba705df Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 25 Jan 2024 15:57:50 +0100
Subject: [PATCH 056/143] XWIKI-21810: Improve suggest URL escaping in
 StringClass

* Remove usage of a deprecated API in StringClass
* Improved formatting for StringClassTest
---
 .../xwiki/objects/classes/StringClass.java    | 11 ++++------
 .../objects/classes/StringClassTest.java      | 22 ++++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
index 6b670225a02d..4fa41961b5f6 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import org.apache.ecs.xhtml.input;
+import org.xwiki.model.reference.LocalDocumentReference;
 import org.xwiki.velocity.tools.EscapeTool;
 import org.xwiki.xml.XMLUtils;
 
@@ -132,14 +133,10 @@ private void displayPickerEdit(input input)
         input.setClass("suggested");
         XWikiContext xWikiContext = getXWikiContext();
         XWiki xwiki = xWikiContext.getWiki();
-        String path = xwiki.getURL("Main.WebHome", "view", xWikiContext);
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(path);
-        stringBuilder.append('?');
-        stringBuilder.append(new EscapeTool().url(getParametersMap()));
-        stringBuilder.append('&');
+        String path = xwiki.getURL(new LocalDocumentReference("Main", "WebHome"), "view", xWikiContext);
+        String stringBuilder = String.format("%s?%s&", path, new EscapeTool().url(getParametersMap()));
         input.setOnFocus(String.format("new ajaxSuggest(this, {script:\"%s\", varname:\"input\"} )",
-            escapeJavaScript(stringBuilder.toString())));
+            escapeJavaScript(stringBuilder)));
     }
 
     private Map<String, String> getParametersMap()
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java
index 7a564f4c214a..e3cf4987f6be 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/classes/StringClassTest.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.model.reference.LocalDocumentReference;
 
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.test.MockitoOldcore;
@@ -53,8 +54,9 @@ void displayEdit()
     {
         XWikiContext xWikiContext = this.oldCore.getXWikiContext();
         xWikiContext.setURLFactory(this.urlFactory);
-        when(this.oldCore.getSpyXWiki().getURL("Main.WebHome", "view", xWikiContext)).thenReturn("/a/b");
-
+        when(this.oldCore.getSpyXWiki()
+            .getURL(new LocalDocumentReference("Main", "WebHome"), "view", xWikiContext)).thenReturn("/a/b");
+        
         String fieldName = "test";
         String spaceName = "\" + alert(1) + \"";
         String pageName = "WebHome";
@@ -68,14 +70,14 @@ void displayEdit()
         StringBuffer stringBuffer = new StringBuffer();
         stringClass.displayEdit(stringBuffer, fieldName, spaceName + "." + pageName + "_0_", baseClass,
             xWikiContext);
-        assertEquals("<input " 
-            + "onfocus='new ajaxSuggest(this, &#123;script:&#34;\\/a\\/b?xpage=suggest&#38;" 
-            + "classname=%22%20%2B%20alert%281%29%20%2B%20%22.WebHome&#38;fieldname=test&#38;firCol=-&#38;" 
-            + "secCol=-&#38;&#34;, varname:&#34;input&#34;} )' " 
-            + "size='30' " 
-            + "id='&#34; + alert(1) + &#34;.WebHome_0_test' " 
-            + "class='suggested' " 
-            + "name='&#34; + alert(1) + &#34;.WebHome_0_test' " 
+        assertEquals("<input "
+            + "onfocus='new ajaxSuggest(this, &#123;script:&#34;\\/a\\/b?xpage=suggest&#38;"
+            + "classname=%22%20%2B%20alert%281%29%20%2B%20%22.WebHome&#38;fieldname=test&#38;firCol=-&#38;"
+            + "secCol=-&#38;&#34;, varname:&#34;input&#34;} )' "
+            + "size='30' "
+            + "id='&#34; + alert(1) + &#34;.WebHome_0_test' "
+            + "class='suggested' "
+            + "name='&#34; + alert(1) + &#34;.WebHome_0_test' "
             + "type='text'/>", stringBuffer.toString());
     }
 }

From 6c990418b48ee04997d46c5bc182f213b3c1e5c1 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 25 Jan 2024 16:58:07 +0100
Subject: [PATCH 057/143] XWIKI-21831: Migrate tour functional tests to docker

---
 .../xwiki-platform-tour-test/pom.xml          |  9 +-
 .../pom.xml                                   | 72 +++++-----------
 .../it}/org/xwiki/tour/test/ui/AllIT.java     | 17 ++--
 .../xwiki/tour/test/ui/TourApplicationIT.java | 83 +++++++++----------
 4 files changed, 82 insertions(+), 99 deletions(-)
 rename xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/{xwiki-platform-tour-test-tests => xwiki-platform-tour-test-docker}/pom.xml (62%)
 rename xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/{xwiki-platform-tour-test-tests/src/test/java => xwiki-platform-tour-test-docker/src/test/it}/org/xwiki/tour/test/ui/AllIT.java (76%)
 rename xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/{xwiki-platform-tour-test-tests/src/test/java => xwiki-platform-tour-test-docker/src/test/it}/org/xwiki/tour/test/ui/TourApplicationIT.java (84%)

diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
index aa76ea5773fa..a968dbcadbee 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
@@ -39,6 +39,13 @@
   </properties>
   <modules>
     <module>xwiki-platform-tour-test-pageobjects</module>
-    <module>xwiki-platform-tour-test-tests</module>
   </modules>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <modules>
+        <module>xwiki-platform-tour-test-docker</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
similarity index 62%
rename from xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml
rename to xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
index ec16eebb0678..0975f731b67f 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
@@ -20,53 +20,55 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour-test</artifactId>
     <version>16.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>xwiki-platform-tour-test-tests</artifactId>
+  <artifactId>xwiki-platform-tour-test-docker</artifactId>
   <name>XWiki Platform - Tour - Tests - Functional Tests</name>
   <!-- TODO: Move to use "functional-test" in the future when http://jira.codehaus.org/browse/MNG-1911 is fixed,
        see https://jira.xwiki.org/browse/XWIKI-7683 -->
   <packaging>jar</packaging>
+  <description>XWiki Platform - Tour - Tests - Functional Tests in Docker</description>
   <properties>
-    <xwikiCfgSuperadminPassword>pass</xwikiCfgSuperadminPassword>
-    <!-- Functional tests are allowed to output content to the console -->
+    <!-- Functional tests are allowed to output content to the console. -->
     <xwiki.surefire.captureconsole.skip>true</xwiki.surefire.captureconsole.skip>
   </properties>
   <dependencies>
-    <!-- The UI we are testing-->
+    <!-- The UI we are testing. -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tour-ui</artifactId>
       <version>${project.version}</version>
       <type>xar</type>
     </dependency>
-    <!-- This macro is used during tests -->
+    <!-- This macro is used during tests. -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-localization-macro</artifactId>
       <version>${project.version}</version>
     </dependency>
-
-    <!-- Test dependencies -->
+    <!-- Test dependencies. -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-tour-test-pageobjects</artifactId>
+      <artifactId>xwiki-platform-test-docker</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-tour-test-pageobjects</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
+    <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>
+      <!-- We need to explicitly include the failsafe plugin since it's not part of the default maven lifecycle -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -74,33 +76,6 @@
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>package</id>
-      <activation>
-        <property>
-          <name>!skipITs</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <!-- TODO: Remove when the http://jira.codehaus.org/browse/MNG-1911 is fixed, see also
-               https://jira.xwiki.org/browse/XWIKI-7683 -->
-          <plugin>
-            <groupId>org.xwiki.platform</groupId>
-            <artifactId>xwiki-platform-tool-packager-plugin</artifactId>
-            <version>${project.version}</version>
-            <executions>
-              <execution>
-                <phase>generate-test-resources</phase>
-                <goals>
-                  <goal>package</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>clover</id>
       <!-- Add the Clover JAR to the WAR so that it's available at runtime when XWiki executes.
@@ -113,19 +88,16 @@
       </dependencies>
       <build>
         <plugins>
-          <!-- Add the Clover JAR to the Packager plugin runtime classpath since the Packager plugin uses java classes
-               that have been instrumented with Clover (XWiki oldcore for example) -->
           <plugin>
-            <groupId>org.xwiki.platform</groupId>
-            <artifactId>xwiki-platform-tool-packager-plugin</artifactId>
-            <version>${project.version}</version>
-            <dependencies>
-              <dependency>
-                <groupId>org.openclover</groupId>
-                <artifactId>clover</artifactId>
-                <version>${clover.version}</version>
-              </dependency>
-            </dependencies>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <systemPropertyVariables>
+                <!-- Tell the Docker-based test to activate the Clover profile so that the Clover JAR is added to
+                     WEB-INF/lib -->
+                <xwiki.test.ui.profiles>clover</xwiki.test.ui.profiles>
+              </systemPropertyVariables>
+            </configuration>
           </plugin>
         </plugins>
       </build>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/AllIT.java b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/AllIT.java
similarity index 76%
rename from xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/AllIT.java
rename to xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/AllIT.java
index 0f85e0171912..2e222462a94b 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/AllIT.java
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/AllIT.java
@@ -19,16 +19,21 @@
  */
 package org.xwiki.tour.test.ui;
 
-import org.junit.runner.RunWith;
-import org.xwiki.test.ui.PageObjectSuite;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.xwiki.test.docker.junit5.UITest;
 
 /**
- * Runs all functional tests found in the classpath.
+ * All UI tests for the Tour feature.
  *
  * @version $Id$
  */
-@RunWith(PageObjectSuite.class)
-public class AllIT
+@UITest
+class AllIT
 {
-
+    @Nested
+    @DisplayName("Tour UI")
+    class NestedTourApplicationIT extends TourApplicationIT
+    {
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/TourApplicationIT.java b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/TourApplicationIT.java
similarity index 84%
rename from xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/TourApplicationIT.java
rename to xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/TourApplicationIT.java
index e6ff7dc8dc4d..64e77e8af004 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-tests/src/test/java/org/xwiki/tour/test/ui/TourApplicationIT.java
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/src/test/it/org/xwiki/tour/test/ui/TourApplicationIT.java
@@ -22,11 +22,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
 import org.xwiki.model.reference.LocalDocumentReference;
-import org.xwiki.test.ui.AbstractTest;
-import org.xwiki.test.ui.SuperAdminAuthenticationRule;
+import org.xwiki.test.docker.junit5.UITest;
+import org.xwiki.test.ui.TestUtils;
 import org.xwiki.test.ui.po.ViewPage;
 import org.xwiki.tour.test.po.PageWithTour;
 import org.xwiki.tour.test.po.StepEditModal;
@@ -34,16 +34,17 @@
 import org.xwiki.tour.test.po.TourFromLivetable;
 import org.xwiki.tour.test.po.TourHomePage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Functional tests for the Tour Application.
  *
  * @version $Id$
  */
-public class TourApplicationIT extends AbstractTest
+@UITest
+class TourApplicationIT
 {
     private static final LocalDocumentReference TOUR_REFERENCE_1 =
         new LocalDocumentReference(List.of("Tour", "Test"), "WebHome");
@@ -51,23 +52,35 @@ public class TourApplicationIT extends AbstractTest
     private static final LocalDocumentReference TOUR_REFERENCE_2 =
         new LocalDocumentReference(List.of("Tour", "NewTest"), "WebHome");
 
-    @Rule
-    public SuperAdminAuthenticationRule superAdminAuthenticationRule = new SuperAdminAuthenticationRule(getUtil());
+    @Test
+    @Order(1)
+    void verifyTourFeatures(TestUtils setup) throws Exception
+    {
+        setup.loginAsSuperAdmin();
+        // Use a scenario since it's a best practice but also because each tour test has consequences on the other one.
+        // For example, the second test binds to a TourClass and thus when displaying the first tour page (which also
+        // contains a TourClass) it would display the second tour...
 
-    private void setUpTour(TourEditPage tourEditPage, String description, boolean isActive, String targetPage,
-        String targetClass) throws Exception
+        setup.rest().delete(TOUR_REFERENCE_1);
+        setup.rest().delete(TOUR_REFERENCE_2);
+
+        tourBoundToPage();
+        tourBoundToClass();
+    }
+
+    private void setUpTour(TourEditPage tourEditPage, String description, String targetPage, String targetClass)
     {
         tourEditPage.setDescription(description);
-        tourEditPage.setIsActive(isActive);
+        tourEditPage.setIsActive(true);
         tourEditPage.setTargetPage(targetPage);
         tourEditPage.setTargetClass(targetClass);
     }
 
-    private void setUpStep(TourEditPage tourEditPage, String element, String title, String content, boolean backdrop,
+    private void setUpStep(TourEditPage tourEditPage, String title, String content, boolean backdrop,
         String targetPage)
     {
         StepEditModal stepEditModal = tourEditPage.newStep();
-        stepEditModal.setElement(element);
+        stepEditModal.setElement("body");
         stepEditModal.setTitle(title);
         stepEditModal.setContent(content);
         stepEditModal.setBackdrop(backdrop);
@@ -75,44 +88,30 @@ private void setUpStep(TourEditPage tourEditPage, String element, String title,
         stepEditModal.save();
     }
 
-    private void deleteTour(String page) throws Exception
+    private void deleteTour()
     {
         TourHomePage tourHomePage = TourHomePage.gotoPage();
-        ViewPage tourPage = tourHomePage.getTourPage(page);
+        ViewPage tourPage = tourHomePage.getTourPage("Test");
         tourPage.delete().clickYes();
     }
 
-    @Test
-    public void verifyTourFeatures() throws Exception
-    {
-        // Use a scenario since it's a best practice but also because each tour test has consequences on the other one.
-        // For example, the second test binds to a TourClass and thus when displaying the first tour page (which
-        // also contains a TourClass) it would display the second tour...
-
-        getUtil().rest().delete(TOUR_REFERENCE_1);
-        getUtil().rest().delete(TOUR_REFERENCE_2);
-
-        tourBoundToPage();
-        tourBoundToClass();
-    }
-
-    private void tourBoundToPage() throws Exception
+    private void tourBoundToPage()
     {
         // First, we need to create a tour
         TourHomePage tourHomePage = TourHomePage.gotoPage();
         TourEditPage tourEditPage = tourHomePage.addNewEntry("Test");
-        setUpTour(tourEditPage, "My nice description", true, "Tour.StartTour.WebHome", "");
+        setUpTour(tourEditPage, "My nice description", "Tour.StartTour.WebHome", "");
 
         // Test to put a translation key, use the translation macro
-        setUpStep(tourEditPage, "body", "tour.app.name", "{{translation key=\"TourCode.TourClass_description\" /}}",
+        setUpStep(tourEditPage, "tour.app.name", "{{translation key=\"TourCode.TourClass_description\" /}}",
             true, "");
         // I voluntary create the object 3 before the 2 to test the 'order' field
-        setUpStep(tourEditPage, "body", "Title 3", "Step 3", true, "");
-        setUpStep(tourEditPage, "body", "Title 2", "Step 2", true, "");
+        setUpStep(tourEditPage, "Title 3", "Step 3", true, "");
+        setUpStep(tourEditPage, "Title 2", "Step 2", true, "");
         // Add a step that will be removed
-        setUpStep(tourEditPage, "body", "to remove", "to remove", false, "");
+        setUpStep(tourEditPage, "to remove", "to remove", false, "");
         // Object 4 used to test the Multipage feature ('targetPage' field)
-        setUpStep(tourEditPage, "body", "Title 4", "Step 4", true, "TourCode.TourClass");
+        setUpStep(tourEditPage, "Title 4", "Step 4", true, "TourCode.TourClass");
 
         // Test that we can change the order of a step
         StepEditModal stepEditModal = tourEditPage.editStep(2);
@@ -283,16 +282,16 @@ private void tourBoundToPage() throws Exception
         homePage.close();
 
         // Verify that we can delete a tour in the LT UI
-        deleteTour("Test");
+        deleteTour();
     }
 
-    private void tourBoundToClass() throws Exception
+    private void tourBoundToClass()
     {
         // First, we need to create a tour
         TourHomePage tourHomePage = TourHomePage.gotoPage();
         TourEditPage tourEditPage = tourHomePage.addNewEntry("NewTest");
-        setUpTour(tourEditPage, "Description", true, "", "TourCode.TourClass");
-        setUpStep(tourEditPage, "body", "Tour Title", "Tour Content", true, "");
+        setUpTour(tourEditPage, "Description", "", "TourCode.TourClass");
+        setUpStep(tourEditPage, "Tour Title", "Tour Content", true, "");
         tourEditPage.clickSaveAndView();
 
         tourHomePage = TourHomePage.gotoPage();

From b2eae91668753a8056d768ac48d64dc56749d907 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Sun, 21 Jan 2024 13:18:34 +0100
Subject: [PATCH 058/143] Added translation using Weblate (Ukrainian)

---
 .../src/main/resources/XWiki/XWikiSyntaxImages.uk.xml            | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
@@ -0,0 +1 @@
+

From 441371b378ac1f83f873bfe6c635d059249b54b9 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Sun, 21 Jan 2024 13:10:00 +0000
Subject: [PATCH 059/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (85 of 85 strings)

Translation: XWiki Platform/LiveData - Macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/livedata-macro/uk/
---
 .../main/resources/ApplicationResources_uk.properties    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
index a961224dde16..cc279a0b7c10 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_uk.properties
@@ -58,7 +58,7 @@ rendering.macro.liveData.parameter.source.description=\u0414\u0436\u0435\u0440\u
 rendering.macro.liveData.parameter.sourceParameters.name=\u0414\u0436\u0435\u0440\u0435\u043B\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0456\u0432
 rendering.macro.liveData.parameter.sourceParameters.description=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u0434\u0436\u0435\u0440\u0435\u043B\u0430 \u0434\u0438\u043D\u0430\u043C\u0456\u0447\u043D\u0438\u0445 \u0434\u0430\u043D\u0438\u0445, \u0432\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0445 \u044F\u043A \u0440\u044F\u0434\u043E\u043A \u0437\u0430\u043F\u0438\u0442\u0443 URL-\u0430\u0434\u0440\u0435\u0441\u0438.
 rendering.macro.liveData.parameter.sort.name=\u0421\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438
-rendering.macro.liveData.parameter.sort.description=\u0412\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0456, \u0434\u043B\u044F \u0441\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0434\u0438\u043D\u0430\u043C\u0456\u0447\u043D\u0438\u0445 \u0434\u0430\u043D\u0438\u0445 \u043D\u0430\u043F\u043E\u0447\u0430\u0442\u043A\u0443, \u0437\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0456 \u044F\u043A \u0432\u0456\u0434\u043E\u043A\u0440\u0435\u043C\u043B\u0435\u043D\u0438\u0439 \u043A\u043E\u043C\u0430\u043C\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u0456\u043C\u0435\u043D \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0435\u0439, \u0434\u0435 \u043A\u043E\u0436\u043D\u0435 \u0456\u043C\u2019\u044F \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0456 \u043C\u043E\u0436\u0435 \u043C\u0430\u0442\u0438 \u043D\u0435\u043E\u0431\u043E\u0432\u2019\u044F\u0437\u043A\u043E\u0432\u0438\u043C \u0441\u0443\u0444\u0456\u043A\u0441 \u0434\u043B\u044F \u043F\u043E\u0440\u044F\u0434\u043A\u0443 \u0441\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0437\u0430 \u0434\u043E\u043F\u043E\u043C\u043E\u0433\u043E\u044E :asc \u0430\u0431\u043E :desc.
+rendering.macro.liveData.parameter.sort.description=\u0412\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0456, \u0434\u043B\u044F \u0441\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0434\u0438\u043D\u0430\u043C\u0456\u0447\u043D\u0438\u0445 \u0434\u0430\u043D\u0438\u0445 \u043D\u0430 \u043F\u043E\u0447\u0430\u0442\u043A\u0443, \u0437\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0456 \u044F\u043A \u0432\u0456\u0434\u043E\u043A\u0440\u0435\u043C\u043B\u0435\u043D\u0438\u0439 \u043A\u043E\u043C\u0430\u043C\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u0456\u043C\u0435\u043D \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0435\u0439, \u0434\u0435 \u043A\u043E\u0436\u043D\u0435 \u0456\u043C\u2019\u044F \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0456 \u043C\u043E\u0436\u0435 \u043C\u0430\u0442\u0438 \u043D\u0435\u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u043C \u0441\u0443\u0444\u0456\u043A\u0441 \u0434\u043B\u044F \u043F\u043E\u0440\u044F\u0434\u043A\u0443 \u0441\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0437\u0430 \u0434\u043E\u043F\u043E\u043C\u043E\u0433\u043E\u044E :asc \u0430\u0431\u043E :desc.
 rendering.macro.liveData.parameter.filters.name=\u0424\u0456\u043B\u044C\u0442\u0440\u0438
 rendering.macro.liveData.parameter.filters.description=\u041F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0456 \u0444\u0456\u043B\u044C\u0442\u0440\u0438, \u044F\u043A\u0456 \u043F\u043E\u0442\u0440\u0456\u0431\u043D\u043E \u0437\u0430\u0441\u0442\u043E\u0441\u0443\u0432\u0430\u0442\u0438 \u0434\u043E \u0434\u0438\u043D\u0430\u043C\u0456\u0447\u043D\u0438\u0445 \u0434\u0430\u043D\u0438\u0445, \u0432\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u0456 \u044F\u043A \u0440\u044F\u0434\u043E\u043A \u0437\u0430\u043F\u0438\u0442\u0443 URL-\u0430\u0434\u0440\u0435\u0441\u0438.
 rendering.macro.liveData.parameter.limit.name=\u041C\u0435\u0436\u0430
@@ -71,6 +71,8 @@ rendering.macro.liveData.parameter.showPageSizeDropdown.name=\u041F\u043E\u043A\
 rendering.macro.liveData.parameter.showPageSizeDropdown.description=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0430\u0431\u043E \u043F\u0440\u0438\u0445\u043E\u0432\u0430\u0442\u0438 \u0432\u0438\u043F\u0430\u0434\u0430\u044E\u0447\u0435 \u043C\u0435\u043D\u044E \u043A\u0456\u043B\u044C\u043A\u043E\u0441\u0442\u0456 \u0441\u0442\u043E\u0440\u0456\u043D\u043E\u043A, \u044F\u043A\u0435 \u0434\u043E\u0437\u0432\u043E\u043B\u044F\u0454 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0435\u0432\u0456 \u0437\u043C\u0456\u043D\u044E\u0432\u0430\u0442\u0438 \u043A\u0456\u043B\u044C\u043A\u0456\u0441\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0456\u0432, \u0449\u043E \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442\u044C\u0441\u044F \u043D\u0430 \u0441\u0442\u043E\u0440\u0456\u043D\u0446\u0456.
 rendering.macro.liveData.parameter.pageSizes.name=\u041A\u0456\u043B\u044C\u043A\u0456\u0441\u0442\u044C \u0441\u0442\u043E\u0440\u0456\u043D\u043E\u043A
 rendering.macro.liveData.parameter.pageSizes.description=\u0412\u0456\u0434\u043E\u043A\u0440\u0435\u043C\u043B\u0435\u043D\u0438\u0439 \u043A\u043E\u043C\u0430\u043C\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u043A\u0456\u043B\u044C\u043A\u043E\u0441\u0442\u0456 \u0441\u0442\u043E\u0440\u0456\u043D\u043E\u043A \u0434\u043B\u044F \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0443 \u0432\u0438\u043F\u0430\u0434\u0430\u044E\u0447\u043E\u043C\u0443 \u043C\u0435\u043D\u044E \u043A\u0456\u043B\u044C\u043A\u043E\u0441\u0442\u0456 \u0441\u0442\u043E\u0440\u0456\u043D\u043E\u043A.
+rendering.macro.liveData.parameter.description.name=\u041E\u043F\u0438\u0441
+rendering.macro.liveData.parameter.description.description=\u041D\u0435\u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u0439 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u0438\u0439 \u043E\u043F\u0438\u0441 \u0434\u0438\u043D\u0430\u043C\u0456\u0447\u043D\u0438\u0445 \u0434\u0430\u043D\u0438\u0445.
 
 #
 # Translation keys for the live data widget.
@@ -100,7 +102,9 @@ livedata.pagination.next=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0430 \u0441
 livedata.pagination.last=\u041E\u0441\u0442\u0430\u043D\u043D\u044F \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0430
 livedata.action.refresh=\u041E\u043D\u043E\u0432\u0438\u0442\u0438
 livedata.action.addEntry=\u0414\u043E\u0434\u0430\u0442\u0438 \u0437\u0430\u043F\u0438\u0441
-livedata.action.resizeColumn.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u0440\u043E\u0437\u043C\u0456\u0440, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C. \u041A\u043B\u0430\u0446\u043D\u0456\u0442\u044C \u0434\u0432\u0456\u0447\u0456, \u0449\u043E\u0431 \u0441\u043A\u0438\u043D\u0443\u0442\u0438.
+livedata.action.columnName.default.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u0446\u0456\u0454\u0457 \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0456, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C \u0430\u0431\u043E \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0456\u0448\u0456 \u0437\u0456 \u0441\u0442\u0440\u0456\u043B\u043A\u0430\u043C\u0438.
+livedata.action.columnName.sortable.hint=\u041A\u043B\u0430\u0446\u043D\u0456\u0442\u044C, \u0449\u043E\u0431 \u0432\u0456\u0434\u0441\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u0437\u0430\u043F\u0438\u0441\u0438 \u0437\u0430 \u0446\u0456\u0454\u044E \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u0456\u0441\u0442\u044E. \u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0440\u044F\u0434\u043E\u043A, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C \u0430\u0431\u043E \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0456\u0448\u0456 \u0437\u0456 \u0441\u0442\u0440\u0456\u043B\u043A\u0430\u043C\u0438.
+livedata.action.resizeColumn.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u0440\u043E\u0437\u043C\u0456\u0440, \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0456\u0442\u044C \u0430\u0431\u043E \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0456\u0448\u0456 \u0437\u0456 \u0441\u0442\u0440\u0456\u043B\u043A\u0430\u043C\u0438. \u041A\u043B\u0430\u0446\u043D\u0456\u0442\u044C \u0434\u0432\u0456\u0447\u0456 \u0430\u0431\u043E \u043D\u0430\u0442\u0438\u0441\u043D\u0456\u0442\u044C Escape, \u0449\u043E\u0431 \u0441\u043A\u0438\u043D\u0443\u0442\u0438.
 livedata.panel.filter.title=\u0424\u0456\u043B\u044C\u0442\u0440
 livedata.panel.filter.noneFilterable=\u0416\u043E\u0434\u043D\u0443 \u0437 \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0445 \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0435\u0439 \u043D\u0435 \u043C\u043E\u0436\u043D\u0430 \u0432\u0456\u0434\u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u0442\u0438.
 livedata.panel.filter.addConstraint=\u0414\u043E\u0434\u0430\u0442\u0438 \u043E\u0431\u043C\u0435\u0436\u0435\u043D\u043D\u044F
@@ -144,3 +148,4 @@ livedata.action.reorder.hint=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u
 
 ## Used to indicate where deprecated keys end
 #@deprecatedend
+

From ee7879c233e307fad82a5dd7f52519426fca340e Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Sun, 21 Jan 2024 13:07:43 +0000
Subject: [PATCH 060/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxEscapes
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxescapes/uk/
---
 .../main/resources/XWiki/XWikiSyntaxEscapes.uk.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
index 2e59dfd02a8b..6d2dbad91d2b 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
@@ -41,24 +41,24 @@
   <hidden>true</hidden>
   <content>= Розширені =
 
-== Уникання ==
+== Екранування ==
 
-=== Уникання 1.0 ===
+=== Екранування 1.0 ===
 
-Дозволяє уникнути синтаксису XWiki.
+Дозволяє екранувати синтаксис XWiki.
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Екранування символу|{{{Це не [посилання]}}}|{{{Це не [посилання]}}}
 
-=== Уникання 2.0 ===
+=== Екранування 2.0 ===
 
-Дозволяє уникнути синтаксису XWiki.
+Дозволяє екранувати синтаксис XWiki.
 
 |=Функція|=Синтаксис XWiki {{velocity}}$crtSyntaxVer{{/velocity}}|=Результат
 |Екранування символу|(((
 {{{Це не ~[~[посилання~]~]}}}
 {{info}}Щоб ввести символ ~~, використовуйте подвійний екран: ~~~~{{/info}}
 )))|{{{Це не [[посилання]]}}}
-|Уникнути довгого тексту
+|Екранування довгого тексту
 (також дивіться "Дослівно")|~{~{~{{{{ деякий **довгий** текст //без// форматування}}}~}~}~}|{{{ деякий **довгий** текст //без// форматування}}}</content>
 </xwikidoc>

From cd9ac891a9ef93c8ad3364003a4807f3b477de09 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Sun, 21 Jan 2024 13:07:35 +0000
Subject: [PATCH 061/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxImages
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaximages/uk/
---
 .../resources/XWiki/XWikiSyntaxImages.uk.xml  | 138 ++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
index 8b137891791f..a86a7337fb3e 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
@@ -1 +1,139 @@
+<?xml version="1.1" encoding="UTF-8"?>
 
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<xwikidoc version="1.5" reference="XWiki.XWikiSyntaxImages" locale="uk">
+  <web>XWiki</web>
+  <name>XWikiSyntaxImages</name>
+  <language>uk</language>
+  <defaultLanguage>en</defaultLanguage>
+  <translation>1</translation>
+  <creator>xwiki:XWiki.Admin</creator>
+  <parent>XWiki.XWikiSyntax</parent>
+  <author>xwiki:XWiki.Admin</author>
+  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
+  <version>1.1</version>
+  <title>XWikiSyntaxImages</title>
+  <comment/>
+  <minorEdit>false</minorEdit>
+  <syntaxId>xwiki/2.1</syntaxId>
+  <hidden>true</hidden>
+  <content>= Редагування =
+
+== Зображення ==
+
+=== Зображення 1.0 ===
+
+|=Функція|=Синтаксис XWiki 1.0|=Результат
+|Зображення з вкладення поточної сторінки|(((
+{{info}}Детальніше [[Image Macro&gt;&gt;https://extensions.xwiki.org/xwiki/bin/view/Extension/Old%20XWiki%201.0%20syntax%20renderer/Image%20Macro%20%28Radeox%29]]{{/info}}
+{{{{image:img.png}}}}
+)))|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з вкладення іншої сторінки|{{{{image:img.png|document=Space.Page}}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з параметрами|{{{{image:img.png|width=25|height=25}}}}|[[image:XWiki.XWikiSyntaxImages@img.png||width="25" height="25"]]
+|Зображення, розташовані за URL|{{{https://some/url/img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+
+=== Зображення 2.0 ===
+
+|=Функція|=Синтаксис XWiki 2.0|=Результат
+|Зображення з вкладення поточної сторінки|{{{image:img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з вкладення іншої сторінки|{{{image:Space.Page@img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з параметрами|{{{[[image:img.png||width="25" height="25"]]}}}|[[image:XWiki.XWikiSyntaxImages@img.png||width="25" height="25"]]
+|Зображення з підписом|{{{[[~[~[XWiki~&gt;~&gt;https://www.xwiki.org~]~] підтримує підписи.&gt;&gt;image:img.png]]}}}|((([[~[~[XWiki~&gt;~&gt;https://www.xwiki.org~]~] підтримує підписи.&gt;&gt;image:XWiki.XWikiSyntaxImages@img.png]])))
+|Зображення, розташовані за URL|{{{image:https://some/url/img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+
+{{velocity}}$subHeading Специфікація зображення синтасксис XWiki 2.0 $subHeading{{/velocity}}
+
+{{info}}
+Частина в ##( )## є обов'язковою, тоді як частини в ##[ ]## необов'язкові.
+{{/info}}
+
+The full format of an image is either **##image~: (reference)##** or **##~[~[{caption&gt;&gt;}image~: (reference) {||parameters}]]##**
+
+* **##caption##**: Необов'язковий підпис. Може містити довільний синтаксис XWiki 2.0, але синтаксис вкладеного посилання має бути екранований за допомогою ##~~##. Підпис підтримується, лише якщо синтаксис зображення є єдиним вмістом абзацу. Зображення з підписом також можна загорнути в посилання. У цьому випадку посилання міститиме зображення, але не підпис.
+* **##image~:##** Обов'язковий рядок, що визначає ресурс як зображення.
+* **##reference##**: Посилання на зображення, яке має відображатися в одній із таких форм:
+** **URL**: Будь-яка URL-адреса зображення у вигляді **##http:~/~/path/imageName##**. Наприклад: ##http:~/~/domain.org/path/img.png##
+** **Attachment**: Посилання у формі **##~{~{~{wikiName:} space.} page@} (imageName)##**
+*** **##wikiName##**: Необов'язковий рядок, що містить назву вікі. Посилання на зображення вказуватиме на зображення, прикріплене до сторінки цієї вікі. Наприклад: mywiki
+*** **##space##**: Необов'язкова назва простору вікі. Якщо не вказано простір, використовується поточний простір. Наприклад: Main
+*** **##page##**: Необов'язковий рядок, що містить назву вікі-сторінки, до якої прикріплено зображення, на яке посилається. Наприклад: WebHome
+*** **##imageName##**: Обов'язковий рядок, що містить назву зображення, доданого до сторінки, оскільки воно зберігається у вікі.
+* **##parameters##**: Необов'язковий список параметрів, відокремлених пробілами, які передаються до зображення. Наприклад: ##width="800" height="600" alt="img.png" title="My nice image"##
+** **HTML attributes**: Усі атрибути, визначені стандартом HTML, будуть додані до візуалізованого HTML ##&lt;img&gt;## тегу.
+*** **##style##**: Інформація про стиль CSS, який потрібно застосувати до зображення. Приклади: ##style="float:right;height:50"## (image on right side, height 50 px), ##style="display:block;margin-left:auto;margin-right:auto;width:80%"## (зображення по центру, ширина становить 80% ширини блоку), ##style="vertical-align:bottom"## (текст починається в нижній частині зображення)
+*** **##height##**: Параметр, який визначає висоту відображуваного зображення. Значення має бути подано або в пікселях (приклад: ##height="80"##), або в пікселях, пов'язаних із висотою блоку, що містить зображення (приклад: ##height="40%"##).
+*** **##width##**: Параметр, який визначає ширину відображеного зображення. Значення має бути подано або в пікселях (приклад: ##width="80"##), або в пікселях, пов'язаних із шириною блоку, що містить зображення (приклад: ##width="40%"##).
+*** **##title##**: Параметр, який визначає назву відображеного зображення, яке буде видно, наприклад, якщо навести на нього кнопку миші. Наприклад: ##title="My nice image"##
+*** **##alt##**: Параметр, який визначає, який текст має відображатися, якщо браузер не може відобразити зображення. Оскільки це обов'язковий HTML-атрибут, XWiki використовуватиме замість нього ім'я файлу, якщо параметр ##alt## не визначено. Наприклад: ##alt="img.png"##
+*** **More**: Детальніше пояснення HTML ##&lt;img&gt;## тегів, що містять більше атрибутів, можна переглянути [[HTML standard&gt;&gt;https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element]].
+
+=== Зображення 2.1 ===
+
+|=Функція|=Синтаксис XWiki 2.1|=Результат
+|Зображення з вкладення поточної сторінки|{{{image:img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з вкладення іншої сторінки|{{{image:PageA.PageB@img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Зображення з параметрами|{{{[[image:img.png||width="25" height="25"]]}}}|[[image:XWiki.XWikiSyntaxImages@img.png||width="25" height="25"]]
+|Зображення з підписом|{{{[[~[~[XWiki~&gt;~&gt;https://www.xwiki.org~]~] підтримує підписи.&gt;&gt;image:img.png]]}}}|((([[~[~[XWiki~&gt;~&gt;https://www.xwiki.org~]~] підтримує підписи.&gt;&gt;image:XWiki.XWikiSyntaxImages@img.png]])))
+|Зображення, розташовані за URL|{{{image:https://some/url/img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
+|Prepackaged Icons|{{{image:icon:accept}}}|image:icon:accept
+
+{{velocity}}$subHeading Специфікація зображення синтасксис XWiki 2.1 $subHeading{{/velocity}}
+
+{{info}}
+Частина в ##( )## є обов'язковою, тоді як частини в ##[ ]## необов'язкові.
+{{/info}}
+
+The full format of an image is either **##image~: (reference)##** or **##~[~[{caption&gt;&gt;}image~: (reference) {||parameters}]]##**
+
+* **##caption##**: Необов'язковий підпис. Може містити довільний синтаксис XWiki 2.1, але синтаксис вкладеного посилання має бути екранований за допомогою ##~~##. Підпис підтримується, лише якщо синтаксис зображення є єдиним вмістом абзацу. Зображення з підписом також можна загорнути в посилання. У цьому випадку посилання міститиме зображення, але не підпис.
+* **##image~:##** Обов'язковий рядок, що визначає ресурс як зображення.
+* **##reference##**: Посилання на зображення, яке має відображатися в одній із таких форм:
+** **URL**: Будь-яка URL-адреса зображення у вигляді **##[url:](protocol:~/~/path/imageName)##**. Наприклад: ##http:~/~/domain.org/path/img.png##
+*** **##url:##** Необов'язковий рядок, що визначає зображення як URL-адресу.
+*** **##protocol:~/~/path/imageName##**: URL-адреса зображення
+** **Attachment**: Посилання у формі **##[attach~:]~{~{~{(wikiName):}(spaceNameList).}(pageName)@}(imageName)##**
+*** **##attach~:##** Необов'язковий рядок, що ідентифікує посилання як вкладення документа XWiki.
+*** **##wikiName##**: Необов'язковий рядок, що містить назву вікі. Посилання на зображення вказуватиме на зображення, прикріплене до сторінки цієї вікі. Якщо не вказано жодної вікі, використовується поточна вікі. Наприклад: ##mywiki##.
+*** **##spaceNameList##**: Необов'язковий список назв вікі-просторів, відокремлених крапками. Якщо не вказано простір, використовується поточний простір. Приклади ##Main##, ##A.B##, ##A.B.C##
+*** **##pageName##**: Необов'язковий рядок, що містить назву вікі-сторінки, до якої приєднано зображення, на яке посилається. Наприклад: ##Welcome##
+*** **##imageName##**: Обов'язковий рядок, що містить назву зображення, доданого до сторінки, оскільки воно зберігається у вікі. Наприклад: ##myImage.png##
+** **Page Attachment**: Посилання у формі **##pageAttach~:~{~{~{(wikiName):}(pageNameList)/}(imageName)##**
+*** **##pageAttach~:##** Обов'язковий рядок, що визначає посилання як вкладення сторінки XWiki.
+*** **##wikiName##**: Необов'язковий рядок, що містить назву вікі. Посилання на зображення вказуватиме на зображення, прикріплене до сторінки цієї вікі. Якщо не вказано жодної вікі, використовується поточна вікі. Наприклад: ##mywiki##.
+*** **##pageNameList##**: Необов'язковий список назв вікі-сторінок, відокремлених крапками. Якщо не вказано жодної сторінки, використовується поточна сторінка. Приклади: ##Main##, ##A/B##, ##A/B/C##
+*** **##imageName##**: Обов'язковий рядок, що містить назву зображення, доданого до сторінки, оскільки воно зберігається у вікі. Наприклад: ##myImage.png##
+** **Icon**: Посилання у формі **##icon{{{:(}}}iconName)##**. Наприклад: **##icon:accept##**
+*** **##icon:##** Обов'язковий рядок, що ідентифікує посилання на зображення як піктограму із [[XWiki Icon Set&gt;&gt;https://www.famfamfam.com/lab/icons/silk/previews/index_abc.png]].
+*** **##iconName##**: Обов'язковий рядок, що ідентифікує піктограму, на який посилається. Наприклад: ##accept##
+** **Data URI**: Посилання у формі **##(data{{{:)}}}(content)##**. Наприклад: **##{{{data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==}}}##**
+*** **##data:##** Обов'язковий рядок, який ідентифікує зображення як таке, що вказано всередині за допомогою [[Data URI scheme&gt;&gt;https://en.wikipedia.org/wiki/Data_URI_scheme]].
+*** **##content##**: Закодоване зображення. Наприклад: ##{{{image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==}}}##
+* **##parameters##**: Необов'язковий список параметрів, відокремлених пробілами, які передаються до зображення. приклад: ##width="800" height="600" alt="img.png" title="My nice image"##
+** **HTML attributes**: Усі атрибути, визначені стандартом HTML, будуть додані до візуалізованого HTML ##&lt;img&gt;## тегу.
+*** **##style##**: Інформація про стиль CSS, який потрібно застосувати до зображення. Приклади: ##style="float:right;height:50"## (image on right side, height 50 px), ##style="display:block;margin-left:auto;margin-right:auto;width:80%"## (зображення по центру, ширина становить 80% ширини блоку), ##style="vertical-align:bottom"## (текст починається в нижній частині зображення)
+*** **##height##**: Параметр, який визначає висоту відображуваного зображення. Значення має бути подано або в пікселях (приклад: ##height="80"##), або в пікселях, пов'язаних із висотою блоку, що містить зображення (приклад: ##height="40%"##).
+*** **##width##**: Параметр, який визначає ширину відображеного зображення. Значення має бути подано або в пікселях (приклад: ##width="80"##), або в пікселях, пов'язаних із шириною блоку, що містить зображення (приклад: ##width="40%"##).
+*** **##title##**: Параметр, який визначає назву відображеного зображення, яке буде видно, наприклад, якщо навести на нього кнопку миші. Наприклад: ##title="My nice image"##
+*** **##alt##**: Параметр, який визначає, який текст має відображатися, якщо браузер не може відобразити зображення. Оскільки це обов'язковий HTML-атрибут, XWiki використовуватиме замість нього ім'я файлу, якщо параметр ##alt## не визначено. Наприклад: ##alt="img.png"##
+*** **More**: Детальніше пояснення HTML ##&lt;img&gt;## тегів, що містять більше атрибутів, можна переглянути [[HTML standard&gt;&gt;https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element]].
+** **##queryString##**: Дозволяє надсилати запити на сервер під час створення посилання для завантаження зображення, на яке посилається. Наприклад: ##queryString="width=100&amp;height=800&amp;keepAspectRatio=true"## (**##keepAspectRatio=true## зазнає невдачі, якщо ##width## та ##height## параметри вказуються додатково до ##queryString##!**)</content>
+  </xwikidoc>

From 7065aac8d9ee04ab584699fd76928f6f83dc9828 Mon Sep 17 00:00:00 2001
From: Pierre Jeanjean <pierre.jeanjean@xwiki.com>
Date: Thu, 25 Jan 2024 21:52:52 +0100
Subject: [PATCH 062/143] XWIKI-21611: Set right author when disabling/enabling
 an account

- fix UsersGroupsRightsManagementIT failing test (#2824)
---
 .../xwiki-platform-administration-test-docker/pom.xml      | 7 +++++++
 .../test/ui/UsersGroupsRightsManagementIT.java             | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
index 8c7177736c03..f56f138f2b65 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
@@ -64,6 +64,13 @@
       <version>${project.version}</version>
       <type>xar</type>
     </dependency>
+    <!-- The UserProfile sheet is used to disable/enable user profiles -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-user-profile-ui</artifactId>
+      <version>${project.version}</version>
+      <type>xar</type>
+    </dependency>
     <!-- ================================
          Test only dependencies
          ================================ -->
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java
index 3c8a7371b955..9115d3fa01f1 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java
@@ -45,7 +45,9 @@
 
 @UITest(properties = {
     // Add the RightsManagerPlugin needed by the test
-    "xwikiCfgPlugins=com.xpn.xwiki.plugin.rightsmanager.RightsManagerPlugin"
+    "xwikiCfgPlugins=com.xpn.xwiki.plugin.rightsmanager.RightsManagerPlugin",
+    // Programming rights are required to disable/enable user profiles (cf. XWIKI-21238)
+    "xwikiPropertiesAdditionalProperties=test.prchecker.excludePattern=.*:XWiki\\.XWikiUserProfileSheet"
 })
 public class UsersGroupsRightsManagementIT
 {

From cb41ba99ce2c04ab70128bb8625f7647c24cd6f6 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 26 Jan 2024 15:29:45 +0200
Subject: [PATCH 063/143] XWIKI-21817: Removing all content from the realtime
 wysiwyg editor prevents coeditors from editing * Rebase the local changes
 that are filtered out during synchronization using a dedicated operational
 transformation that drops local changes that fall inside a remote delete
 operation. * Add functional test to prove the fix. * Small bulletproofing of
 editor.js * Small cleanup of wysiwygEditor.js * Fix RichTextAreaElement page
 object that was performing actions on the active element which is not
 necessarily the BODY element but some nested editable area (e.g. when a macro
 is editable in-line). * Add a method to RichTextAreaElement to wait for some
 plain text (the existing waitUntilContentContains can match HTML attributes
 or comments like macro markers, which is not what we want).

(cherry picked from commit 9c50bff5e16f9f9f28960c9481c49c365dace24d)
---
 .../ckeditor/test/po/RichTextAreaElement.java |  32 ++-
 .../test/ui/RealtimeWYSIWYGEditorIT.java      | 165 +++++++++++----
 .../src/main/webjar/editor.js                 |   4 +-
 .../src/main/webjar/patches.js                |   8 +-
 .../src/main/webjar/transformers.js           | 200 ++++++++++++++++++
 .../src/main/webjar/wysiwygEditor.js          |  35 +--
 6 files changed, 369 insertions(+), 75 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/transformers.js

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java
index ccc3e1c5c800..c88e47dc344e 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java
@@ -63,7 +63,7 @@ public RichTextAreaElement(WebElement iframe)
     public String getText()
     {
         try {
-            return getActiveElement().getText();
+            return getRootEditableElement().getText();
         } finally {
             getDriver().switchTo().defaultContent();
         }
@@ -75,7 +75,7 @@ public String getText()
     public void clear()
     {
         try {
-            getActiveElement().clear();
+            getRootEditableElement().clear();
         } finally {
             getDriver().switchTo().defaultContent();
         }
@@ -87,7 +87,7 @@ public void clear()
     public void click()
     {
         try {
-            getActiveElement().click();
+            getRootEditableElement().click();
         } finally {
             getDriver().switchTo().defaultContent();
         }
@@ -157,6 +157,19 @@ public void waitUntilContentContains(String html)
             .until((ExpectedCondition<Boolean>) d -> StringUtils.contains(getContent(), html));
     }
 
+    /**
+     * Waits until the rich text area contains the specified plain text.
+     * 
+     * @param textFragment the text fragment to wait for
+     * @since 16.0
+     * @since 15.10.6
+     */
+    public void waitUntilTextContains(String textFragment)
+    {
+        new WebDriverWait(getDriver(), Duration.ofSeconds(getDriver().getTimeout()))
+            .until((ExpectedCondition<Boolean>) d -> StringUtils.contains(getText(), textFragment));
+    }
+
     /**
      * @return the HTML element that has the focus in the Rich editor
      */
@@ -166,6 +179,15 @@ private WebElement getActiveElement()
         return getDriver().switchTo().activeElement();
     }
 
+    /**
+     * @return the top most editable element in the rich text area (that includes all the editable content, including
+     *         nested editable areas)
+     */
+    private WebElement getRootEditableElement()
+    {
+        return getDriver().switchTo().frame(this.iframe).findElement(By.tagName("body"));
+    }
+
     /**
      * Waits until the content is editable.
      *
@@ -187,9 +209,9 @@ public void waitUntilContentEditable()
     public RichTextAreaElement waitForPlaceholder(String placeholder)
     {
         try {
-            WebElement activeElement = getActiveElement();
+            WebElement rootEditableElement = getRootEditableElement();
             getDriver().waitUntilCondition(
-                driver -> Objects.equals(placeholder, activeElement.getAttribute("data-cke-editorplaceholder")));
+                driver -> Objects.equals(placeholder, rootEditableElement.getAttribute("data-cke-editorplaceholder")));
         } finally {
             getDriver().switchTo().defaultContent();
         }
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index ea3d7f47b29b..836a9b2c194f 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -215,7 +215,7 @@ void editWithSelf(TestReference testReference, TestUtils setup)
 
         // Switch to the second tab and verify the content.
         setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("three");
+        secondTextArea.waitUntilTextContains("three");
 
         // There should be no placeholder text anymore because the content is not empty.
         secondTextArea.waitForPlaceholder(null);
@@ -265,7 +265,7 @@ void editWithSelf(TestReference testReference, TestUtils setup)
 
         // Switch to the second tab and click on the coeditor indicator.
         setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("end");
+        secondTextArea.waitUntilTextContains("end");
         firstPosition = secondTextArea.getCoeditorPosition(firstCoeditorId).waitForLocation(new Point(3, 18 + 22 * 30));
         assertFalse(firstPosition.isVisible(), "The coeditor position is visible before scrolling.");
         secondEditor.getToolBar().getCoeditor(firstCoeditorId).click();
@@ -299,7 +299,7 @@ void inplaceEditableMacro(TestReference testReference, TestUtils setup)
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
-        secondTextArea.waitUntilContentContains("one");
+        secondTextArea.waitUntilTextContains("one");
         secondTextArea.sendKeys("/info");
         AutocompleteDropdown qa = new AutocompleteDropdown();
         qa.waitForItemSelected("/info", "Info Box");
@@ -352,7 +352,7 @@ void inplaceEditableMacro(TestReference testReference, TestUtils setup)
         // Wait for the content to be synchronized before saving, otherwise we might save partial content and, more
         // importantly, we could trigger the leave confirmation (if the content is synchronized after the content dirty
         // flag is set to false by the action buttons listener).
-        secondTextArea.waitUntilContentContains("three");
+        secondTextArea.waitUntilTextContains("three");
 
         // Save and check the result.
         ViewPage viewPage = secondEditPage.clickSaveAndView();
@@ -386,7 +386,7 @@ void editDifferentParagraphs(TestReference testReference, TestUtils setup)
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
         // Each user types in their own paragraph.
-        secondTextArea.waitUntilContentContains("Start.");
+        secondTextArea.waitUntilTextContains("Start.");
         secondTextArea.sendKeys(Keys.END, Keys.ENTER);
 
         String firstUserText = "The five boxing wizards jump quickly. The quick brown fox jumps over the lazy dog. First";
@@ -412,7 +412,7 @@ void editDifferentParagraphs(TestReference testReference, TestUtils setup)
         secondTextArea.sendKeys("End.");
 
         // Wait to receive all the content typed by the first user.
-        secondTextArea.waitUntilContentContains("First");
+        secondTextArea.waitUntilTextContains("First");
 
         ViewPage viewPage = secondEditPage.clickSaveAndView();
         assertEquals("Start. " + firstUserText + "\n" + secondUserText + " End.", viewPage.getContent());
@@ -445,7 +445,7 @@ void editSameParagraph(TestReference testReference, TestUtils setup)
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
         // Each user types in their own paragraph.
-        secondTextArea.waitUntilContentContains("Separator.");
+        secondTextArea.waitUntilTextContains("Separator.");
         secondTextArea.sendKeys(Keys.END);
 
         String text = "The quick brown fox jumps over the lazy dog.";
@@ -476,7 +476,7 @@ void editSameParagraph(TestReference testReference, TestUtils setup)
         //
         setup.getDriver().switchTo().window(secondTabHandle);
         // Wait to receive all the content typed by the first user.
-        secondTextArea.waitUntilContentContains("First.");
+        secondTextArea.waitUntilTextContains("First.");
 
         ViewPage viewPage = secondEditPage.clickSaveAndView();
         assertEquals(text + " First. Separator. " + text, viewPage.getContent());
@@ -508,7 +508,7 @@ void applyInlineStylesOnTheSameParagraph(TestReference testReference, TestUtils
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
-        secondTextArea.waitUntilContentContains("italic");
+        secondTextArea.waitUntilTextContains("italic");
         secondTextArea.sendKeys(Keys.END, " underline");
         // Select the "underline" word.
         secondTextArea.sendKeys(Keys.chord(Keys.SHIFT, Keys.CONTROL, Keys.ARROW_LEFT));
@@ -521,7 +521,7 @@ void applyInlineStylesOnTheSameParagraph(TestReference testReference, TestUtils
 
         // If we don't wait then the italic style might be applied before the "underline" word is retrieved, which leads
         // to the "underline" word being inserted inside the italic style.
-        firstTextArea.waitUntilContentContains("underline");
+        firstTextArea.waitUntilTextContains("underline");
 
         // Select the "italic" word and apply the italic style.
         firstTextArea.sendKeys(Keys.chord(Keys.SHIFT, Keys.CONTROL, Keys.ARROW_LEFT));
@@ -561,7 +561,7 @@ void applyInlineStylesOnTheSameParagraph(TestReference testReference, TestUtils
         setup.getDriver().switchTo().window(firstTabHandle);
         firstTextArea.sendKeys(Keys.ARROW_RIGHT, "er");
 
-        firstTextArea.waitUntilContentContains("end");
+        firstTextArea.waitUntilTextContains("end");
         String content = firstTextArea.getContent();
         assertTrue(content.contains("<strong>bolder</strong> <em>italic</em> <ins>underline</ins> end"),
             "Unexpected content: " + content);
@@ -598,7 +598,7 @@ void imageWithCaption(TestReference testReference, TestUtils setup) throws Excep
         RealtimeWYSIWYGEditPage secondEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
-        secondTextArea.waitUntilContentContains("before");
+        secondTextArea.waitUntilTextContains("before");
         secondTextArea.sendKeys(Keys.END, Keys.ENTER);
 
         // Insert the image with caption.
@@ -618,7 +618,7 @@ void imageWithCaption(TestReference testReference, TestUtils setup) throws Excep
         //
 
         setup.getDriver().switchTo().window(firstTabHandle);
-        firstTextArea.waitUntilContentContains("Tree");
+        firstTextArea.waitUntilTextContains("Tree");
         firstTextArea.sendKeys(Keys.ARROW_DOWN, Keys.HOME, "Small ");
 
         //
@@ -626,7 +626,7 @@ void imageWithCaption(TestReference testReference, TestUtils setup) throws Excep
         //
 
         setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("Small");
+        secondTextArea.waitUntilTextContains("Small");
         secondTextArea.sendKeys(Keys.chord(Keys.CONTROL, Keys.SHIFT, Keys.ARROW_LEFT));
         secondTextArea.sendKeys(Keys.chord(Keys.CONTROL, "b"));
 
@@ -684,7 +684,7 @@ void editSameMacro(TestReference testReference, TestUtils setup)
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
-        secondTextArea.waitUntilContentContains("one");
+        secondTextArea.waitUntilTextContains("one");
         // Focus the rich text area.
         secondTextArea.click();
         // Move the caret inside the information box.
@@ -713,7 +713,7 @@ void editSameMacro(TestReference testReference, TestUtils setup)
         //
 
         setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("Some title");
+        secondTextArea.waitUntilTextContains("Some title");
         secondMacroEditModal.clickSubmit();
 
         // The content is reloaded when a macro is updated.
@@ -731,7 +731,7 @@ void editSameMacro(TestReference testReference, TestUtils setup)
         //
 
         setup.getDriver().switchTo().window(firstTabHandle);
-        firstTextArea.waitUntilContentContains("Some cool title");
+        firstTextArea.waitUntilTextContains("Some cool title");
 
         // Edit again the macro an verify that we have the correct parameter value.
         firstMacroEditModal = firstEditor.getBalloonToolBar().editMacro();
@@ -770,39 +770,43 @@ void reloadEditorsMergeConflictManualSave(TestReference testReference, TestUtils
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
-        secondTextArea.waitUntilContentContains("First");
+        secondTextArea.waitUntilTextContains("First");
 
         //
         // Third Tab
         //
 
-        String thirdTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
-
+        setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
         RealtimeWYSIWYGEditPage thirdEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
         RealtimeCKEditor thirdEditor = thirdEditPage.getContenEditor();
         RealtimeRichTextAreaElement thirdTextArea = thirdEditor.getRichTextArea();
-        thirdTextArea.waitUntilContentContains("First");
+        thirdTextArea.waitUntilTextContains("First");
 
         thirdEditPage.leaveRealtimeEditing();
 
-        thirdTextArea.sendKeys(Keys.END, " Second");
+        thirdTextArea.sendKeys(Keys.END, " Third");
         thirdEditPage.clickSaveAndContinue();
 
-        // First tab
+        //
+        // Second tab
+        //
 
-        setup.getDriver().switchTo().window(firstTabHandle);
-        firstTextArea.sendKeys(Keys.END, " First");
-        firstTextArea.waitUntilContentContains("First First");
-        firstEditPage.clickSaveAndContinue(false);
+        setup.getDriver().switchTo().window(secondTabHandle);
+        secondTextArea.sendKeys(Keys.END, " Second");
+        secondEditPage.clickSaveAndContinue(false);
 
         EditConflictModal editConflictModal = new EditConflictModal();
         editConflictModal.makeChoiceAndSubmit(ConflictChoice.RELOAD, false);
 
-        firstTextArea.waitUntilContentContains("First Second");
+        secondTextArea.waitUntilTextContains("Third");
 
-        // Second tab
-        setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("First Second");
+        //
+        // First tab
+        //
+
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstTextArea.waitUntilTextContains("Third");
+        assertEquals("First Third", firstTextArea.getText());
     }
     
     @Test
@@ -832,34 +836,109 @@ void reloadEditorsSilentMergeConflictManualSave(TestReference testReference, Tes
         RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
         RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
 
-        secondTextArea.waitUntilContentContains("First");
+        secondTextArea.waitUntilTextContains("First");
 
         //
         // Third Tab
         //
 
-        String thirdTabHandle = setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
-
+        setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
         RealtimeWYSIWYGEditPage thirdEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
         RealtimeCKEditor thirdEditor = thirdEditPage.getContenEditor();
         RealtimeRichTextAreaElement thirdTextArea = thirdEditor.getRichTextArea();
-        thirdTextArea.waitUntilContentContains("First");
+        thirdTextArea.waitUntilTextContains("First");
 
         thirdEditPage.leaveRealtimeEditing();
 
-        thirdTextArea.sendKeys(Keys.END, Keys.ENTER, "Second");
+        thirdTextArea.sendKeys(Keys.END, Keys.ENTER, "Third");
         thirdEditPage.clickSaveAndContinue();
 
+        //
+        // Second tab
+        //
+
+        setup.getDriver().switchTo().window(secondTabHandle);
+        secondEditPage.clickSaveAndContinue();
+        secondTextArea.waitUntilTextContains("Third");
+
+        //
         // First tab
+        //
+
         setup.getDriver().switchTo().window(firstTabHandle);
-        firstEditPage.clickSaveAndContinue();
+        firstTextArea.waitUntilTextContains("Third");
+        assertEquals("First\nThird", firstTextArea.getText());
+    }
+
+    @Test
+    @Order(11)
+    void removeAllContent(TestReference testReference, TestUtils setup)
+    {
+        //
+        // First Tab
+        //
 
-        firstTextArea.waitUntilContentContains("First");
-        firstTextArea.waitUntilContentContains("Second");
+        // Start fresh.
+        setup.deletePage(testReference);
 
-        // Second tab
-        setup.getDriver().switchTo().window(secondTabHandle);
-        secondTextArea.waitUntilContentContains("First");
-        secondTextArea.waitUntilContentContains("Second");
+        RealtimeWYSIWYGEditPage firstEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor firstEditor = firstEditPage.getContenEditor();
+        RealtimeRichTextAreaElement firstTextArea = firstEditor.getRichTextArea();
+
+        // Type some text and insert an information box.
+        firstTextArea.sendKeys("before", Keys.ENTER, "/info");
+        AutocompleteDropdown qa = new AutocompleteDropdown();
+        qa.waitForItemSelected("/info", "Info Box");
+        firstTextArea.sendKeys(Keys.ENTER);
+        qa.waitForItemSubmitted();
+
+        // The content is reloaded when a macro is inserted.
+        firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.waitUntilContentEditable();
+
+        // Select the default information message and delete it.
+        firstTextArea.sendKeys(Keys.ARROW_DOWN, Keys.ARROW_UP, Keys.chord(Keys.SHIFT, Keys.HOME), Keys.BACK_SPACE);
+
+        // Insert a nested error box.
+        firstTextArea.sendKeys("inside", Keys.ENTER, "/err");
+        qa = new AutocompleteDropdown();
+        qa.waitForItemSelected("/err", "Error Box");
+        firstTextArea.sendKeys(Keys.ENTER);
+        qa.waitForItemSubmitted();
+
+        // The content is reloaded when a macro is inserted.
+        firstTextArea = firstEditor.getRichTextArea();
+        firstTextArea.waitUntilContentEditable();
+
+        // Replace the default error message.
+        firstTextArea.sendKeys(Keys.PAGE_DOWN, Keys.ARROW_UP, Keys.ARROW_UP, Keys.chord(Keys.SHIFT, Keys.HOME),
+            Keys.BACK_SPACE);
+        firstTextArea.sendKeys("nested");
+
+        // Type some text after the information box.
+        firstTextArea.sendKeys(Keys.PAGE_DOWN, "after");
+
+        //
+        // Second Tab
+        //
+
+        setup.getDriver().switchTo().newWindow(WindowType.TAB).getWindowHandle();
+        RealtimeWYSIWYGEditPage secondEditPage = RealtimeWYSIWYGEditPage.gotoPage(testReference);
+        RealtimeCKEditor secondEditor = secondEditPage.getContenEditor();
+        RealtimeRichTextAreaElement secondTextArea = secondEditor.getRichTextArea();
+
+        secondTextArea.waitUntilTextContains("after");
+        // Overwrite the entire content.
+        secondTextArea.sendKeys(Keys.chord(Keys.CONTROL, "a"));
+        secondTextArea.sendKeys(Keys.BACK_SPACE, "end");
+
+        //
+        // First Tab
+        //
+
+        setup.getDriver().switchTo().window(firstTabHandle);
+        firstTextArea.waitUntilTextContains("end");
+        firstTextArea.sendKeys(Keys.END, "ing");
+        assertEquals("ending", firstTextArea.getText());
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
index 455d636d94e8..402e4373e1c0 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
@@ -190,7 +190,9 @@ define('xwiki-realtime-wysiwyg-editor', [
           // We also have to reinitialize the nested widgets.
           updatedWidget.wrapper.find('.cke_widget_wrapper').toArray().forEach(nestedWidgetWrapper => {
             const nestedWidget = this._ckeditor.widgets.getByElement(nestedWidgetWrapper, true);
-            updatedWidgets.add(nestedWidget);
+            if (nestedWidget) {
+              updatedWidgets.add(nestedWidget);
+            }
           });
         }
       });
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
index 1bbf9948e6c9..dc66aad42287 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
@@ -19,11 +19,15 @@
  */
 define('xwiki-realtime-wysiwyg-patches', [
   'xwiki-realtime-wysiwyg-filters',
+  'xwiki-realtime-wysiwyg-transformers',
   'hyper-json',
   'diff-dom',
   'json.sortify',
   'chainpad',
-], function (Filters, HyperJSON, DiffDOM, JSONSortify, ChainPad) {
+], function (
+  /* jshint maxparams:false */
+  Filters, Transformers, HyperJSON, DiffDOM, JSONSortify, ChainPad
+) {
   'use strict';
 
   // HTML block-level elements.
@@ -239,7 +243,7 @@ define('xwiki-realtime-wysiwyg-patches', [
       const localOperations = ChainPad.Diff.diff(localFilteredHyperJSON, localHyperJSON);
       const remoteOperations = ChainPad.Diff.diff(localFilteredHyperJSON, remoteFilteredHyperJSON);
       // Transform the local operations so that we can apply them on top of the remote content.
-      const updatedLocalOperations = ChainPad.NaiveJSONTransformer(localOperations, remoteOperations,
+      const updatedLocalOperations = Transformers.RebaseNaiveJSONTransformer(localOperations, remoteOperations,
         localFilteredHyperJSON);
       // Apply the updated operations to the remote content in order to perform the 3-way merge (rebase). This way we
       // integrate the local filtered content (user state, browser specific markup) into the remote content.
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/transformers.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/transformers.js
new file mode 100644
index 000000000000..0d13cd98b279
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/transformers.js
@@ -0,0 +1,200 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+define('xwiki-realtime-wysiwyg-transformers', ['chainpad'], function(ChainPad) {
+  'use strict';
+
+  /**
+   * The given text has been modified both remotely, by the specified {@code remoteOperations}, and locally, by the
+   * specified {@code localOperations}. This function transforms (rebases / three-way merge) the local operations
+   * against the remote operations, so that they can be applied to the given text on top of the remote operations.
+   * 
+   * Unlike {@link NaiveJSONTransformer}, this transformer ignores local operations that fall inside a remote delete
+   * operation (i.e. local modifications to content that is deleted remotely are ignored).
+   * 
+   * @param {Array<Operation>} localOperations your own local operations
+   * @param {Array<Operation>} remoteOperations the incoming remote operations (performed by other users)
+   * @param {string} text the mutual common ancestor (the text before the local and remote operations were performed)
+   * @returns {Array<Operation>} the transformed (rebased) local operations
+   */
+  function RebaseNaiveJSONTransformer(localOperations, remoteOperations, text) {
+    const DEBUG = ChainPad.Common.global.REALTIME_DEBUG = ChainPad.Common.global.REALTIME_DEBUG || {};
+
+    let rebasedLocalOperations, textAfterRemoteOperations, textAfterRebase, error, errorType;
+    try {
+      rebasedLocalOperations = RebaseTextTransformer(localOperations, remoteOperations, text);
+      textAfterRemoteOperations = ChainPad.Operation.applyMulti(remoteOperations, text);
+      textAfterRebase = ChainPad.Operation.applyMulti(rebasedLocalOperations, textAfterRemoteOperations);
+
+      try {
+        JSON.parse(textAfterRebase);
+        return rebasedLocalOperations;
+      } catch (e) {
+        error = e;
+        errorType = 'ot_parseError';
+      }
+    } catch (e) {
+      error = e;
+      errorType = 'ot_applyError';
+    }
+
+    DEBUG[errorType] = {
+      error,
+
+      remoteOperations,
+      localOperations,
+      rebasedLocalOperations,
+
+      text,
+      textAfterRemoteOperations,
+      textAfterRebase
+    };
+    console.error(error);
+    console.log('Debugging info available at `window.REALTIME_DEBUG.' + errorType + '`');
+
+    // Return an empty patch in case we can't do anything else.
+    return [];
+  }
+
+  /**
+   * The given text has been modified both remotely, by the specified {@code remoteOperations}, and locally, by the
+   * specified {@code localOperations}. This function transforms (rebases / three-way merge) the local operations
+   * against the remote operations, so that they can be applied to the given text on top of the remote operations.
+   * 
+   * Unlike {@link TextTransformer}, this transformer ignores local operations that fall inside a remote delete
+   * operation (i.e. local modifications to content that is deleted remotely are ignored).
+   * 
+   * @param {Array<Operation>} localOperations your own local operations
+   * @param {Array<Operation>} remoteOperations the incoming remote operations (performed by other users)
+   * @param {string} text the mutual common ancestor (the text before the local and remote operations were performed)
+   * @returns {Array<Operation>} the transformed (rebased) local operations
+   */
+  function RebaseTextTransformer(localOperations, remoteOperations, text) {
+    let textAfterRemoteOperations = ChainPad.Operation.applyMulti(remoteOperations, text);
+
+    let rebasedLocalOperations = [];
+    for (let i = localOperations.length - 1; i >= 0; i--) {
+        let rebasedLocalOperation = localOperations[i];
+        for (let j = remoteOperations.length - 1; j >= 0; j--) {
+            try {
+              rebasedLocalOperation = rebaseOperationSafely(rebasedLocalOperation, remoteOperations[j]);
+            } catch (e) {
+                console.error("The pluggable transform function threw an error, " +
+                  "failing operational transformation");
+                console.error(e.stack);
+                return [];
+            }
+            if (!rebasedLocalOperation) {
+                break;
+            }
+        }
+        if (rebasedLocalOperation) {
+            if (ChainPad.Common.PARANOIA) {
+              ChainPad.Operation.check(rebasedLocalOperation, textAfterRemoteOperations.length);
+            }
+            rebasedLocalOperations.unshift(rebasedLocalOperation);
+        }
+    }
+
+    return rebasedLocalOperations;
+  }
+
+  /**
+   * Transforms the given {@code localOperation} so that it can be applied on top of the given {@code remoteOperation}.
+   *
+   * @param {Operation} localOperation your own local operation
+   * @param {Operation} remoteOperation the incoming remote operation (performed by another user)
+   * @returns {Operation} the transformed (rebased) local operation, or {@code null} if the local operation should be
+   *   ignored
+   */
+  function rebaseOperationSafely(localOperation, remoteOperation) {
+    if (ChainPad.Common.PARANOIA) {
+      ChainPad.Operation.check(localOperation);
+      ChainPad.Operation.check(remoteOperation);
+    }
+    const rebasedLocalOperation = rebaseOperation(localOperation, remoteOperation);
+    if (ChainPad.Common.PARANOIA && rebasedLocalOperation) {
+      ChainPad.Operation.check(rebasedLocalOperation);
+    }
+    return rebasedLocalOperation;
+  }
+
+  /**
+   * Transforms the given {@code localOperation} so that it can be applied on top of the given {@code remoteOperation}.
+   *
+   * @param {Operation} localOperation your own local operation
+   * @param {Operation} remoteOperation the incoming remote operation (performed by another user)
+   * @returns {Operation} the transformed (rebased) local operation, or {@code null} if the local operation should be
+   *   ignored
+   */
+  function rebaseOperation(localOperation, remoteOperation) {
+    let rebasedLocalOperation;
+    if (localOperation.offset > remoteOperation.offset) {
+      if (localOperation.offset > remoteOperation.offset + remoteOperation.toRemove) {
+        // Simple rebase.
+        rebasedLocalOperation = ChainPad.Operation.create(
+          localOperation.offset - remoteOperation.toRemove + remoteOperation.toInsert.length,
+          localOperation.toRemove,
+          localOperation.toInsert
+        );
+      } else if (localOperation.offset + localOperation.toRemove < remoteOperation.offset + remoteOperation.toRemove) {
+        // Discard the local operation because it modifies content that has been removed by the remote operation.
+        rebasedLocalOperation = null;
+      } else {
+        // We have to truncate the content that the local operation removes because some part of it was already removed
+        // by the remote operation.
+        rebasedLocalOperation = ChainPad.Operation.create(
+          remoteOperation.offset + remoteOperation.toInsert.length,
+          localOperation.toRemove - (remoteOperation.offset + remoteOperation.toRemove - localOperation.offset),
+          localOperation.toInsert
+        );
+      }
+    } else if (localOperation.offset + localOperation.toRemove < remoteOperation.offset) {
+      // The local operation is not affected by the remote operation.
+      rebasedLocalOperation = localOperation;
+    } else if (localOperation.offset + localOperation.toRemove < remoteOperation.offset + remoteOperation.toRemove) {
+      // We have to truncate the content that the local operation removes because some part of it was already removed by
+      // the remote operation.
+      rebasedLocalOperation = ChainPad.Operation.create(
+        localOperation.offset,
+        remoteOperation.offset - localOperation.offset,
+        localOperation.toInsert
+      );
+    } else {
+      // The local operation removes the content inserted by the remote operation.
+      rebasedLocalOperation = ChainPad.Operation.create(
+        localOperation.offset,
+        localOperation.toRemove - remoteOperation.toRemove + remoteOperation.toInsert.length,
+        localOperation.toInsert
+      );
+    }
+
+    if (!rebasedLocalOperation?.toRemove && !rebasedLocalOperation?.toInsert?.length) {
+      // Discard the rebased local operation because it doesn't do anything.
+      rebasedLocalOperation = null;
+    }
+
+    return rebasedLocalOperation;
+  }
+
+  return {
+    RebaseNaiveJSONTransformer,
+    RebaseTextTransformer
+  };
+});
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
index 9a7dd6787621..5e9847af2361 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
@@ -35,7 +35,7 @@ define('xwiki-realtime-wysiwyg', [
 ], function (
   /* jshint maxparams:false */
   $, realtimeConfig, Messages, ErrorBox, Toolbar, ChainPadNetflux, UserData, TypingTest, Interface, Saver,
-  Chainpad, Crypto, Editor, Patches
+  ChainPad, Crypto, Editor, Patches
 ) {
   'use strict';
 
@@ -145,13 +145,10 @@ define('xwiki-realtime-wysiwyg', [
       // Initialize the editable content when the editor is ready.
       initEditableContent();
 
-      let afterRefresh = [];
       genericEditor.onContentLoaded(function() {
         // Re-initialize the editable content after it is reloaded.
         initEditableContent();
         initializing = false;
-        afterRefresh.forEach(item => item());
-        afterRefresh = [];
       });
 
       const setEditable = module.setEditable = function(editable) {
@@ -171,18 +168,6 @@ define('xwiki-realtime-wysiwyg', [
       // The editor wrapper used to update the edited content without losing the caret position.
       patchedEditor = new Patches(genericEditor),
 
-      findMacroComments = function(el) {
-        const arr = [];
-        for (const node of el.childNodes) {
-          if (node.nodeType === 8 && node.data && /startmacro/.test(node.data)) {
-            arr.push(node);
-          } else {
-            arr.push(...findMacroComments(node));
-          }
-        }
-        return arr;
-      },
-
       createSaver = function(info) {
         Saver.lastSaved.mergeMessage = Interface.createMergeMessageElement(
           toolbar.toolbar.find('.rt-toolbar-rightside'));
@@ -209,11 +194,13 @@ define('xwiki-realtime-wysiwyg', [
             }
           },
           getTextAtCurrentRevision: function(revision) {
-            return $.get(XWiki.currentDocument.getURL('get', $.param({xpage:'get',
-                                                                      outputSyntax:'annotatedhtml',
-                                                                      outputSyntaxVersion:'5.0',
-                                                                      transformations:'macro',
-                                                                      rev:revision})));
+            return $.get(XWiki.currentDocument.getURL('get', $.param({
+              xpage:'get',
+              outputSyntax:'annotatedhtml',
+              outputSyntaxVersion:'5.0',
+              transformations:'macro',
+              rev:revision
+            })));
           },
           realtime: info.realtime,
           userList: info.userList,
@@ -354,7 +341,7 @@ define('xwiki-realtime-wysiwyg', [
         // Operational Transformation
         // The synchronization is done on JSON so we need to make sure the output of the synchronization is always
         // valid JSON.
-        patchTransformer: Chainpad.NaiveJSONTransformer,
+        patchTransformer: ChainPad.NaiveJSONTransformer,
 
         validateContent: function(content) {
           try {
@@ -384,7 +371,7 @@ define('xwiki-realtime-wysiwyg', [
             console.warn('Unexpected local content after synchronization: ', {
               expected: remoteContent,
               actual: localContent,
-              diff: Chainpad.Diff.diff(remoteContent, localContent)
+              diff: ChainPad.Diff.diff(remoteContent, localContent)
             });
           }
         },
@@ -543,7 +530,7 @@ define('xwiki-realtime-wysiwyg', [
             console.error('Unexpected remote content after synchronization: ', {
               expected: localContent,
               actual: remoteContent,
-              diff: Chainpad.Diff.diff(localContent, remoteContent)
+              diff: ChainPad.Diff.diff(localContent, remoteContent)
             });
           }
         }

From 2c56a602fd5873c40480a8238f897f57f5ce08ae Mon Sep 17 00:00:00 2001
From: Gankov Andrey <gav@qsolution.ru>
Date: Sat, 27 Jan 2024 08:46:40 +0100
Subject: [PATCH 064/143] Added translation using Weblate (Russian)

---
 .../resources/Refactoring/Code/RefactoringTranslations.ru.xml    | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml

diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml
@@ -0,0 +1 @@
+

From 2549030d4091c8925fa668269f20f38172f965c8 Mon Sep 17 00:00:00 2001
From: Gankov Andrey <gav@qsolution.ru>
Date: Sat, 27 Jan 2024 07:44:25 +0000
Subject: [PATCH 065/143] Translated using Weblate (Russian)

Currently translated at 100.0% (85 of 85 strings)

Translation: XWiki Platform/LiveData - Macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/livedata-macro/ru/
---
 .../src/main/resources/ApplicationResources_ru.properties  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
index 19d1ebe3eff0..50f884122202 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ru.properties
@@ -71,6 +71,8 @@ rendering.macro.liveData.parameter.showPageSizeDropdown.name=\u041F\u043E\u043A\
 rendering.macro.liveData.parameter.showPageSizeDropdown.description=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u043B\u0438 \u0441\u043A\u0440\u044B\u0442\u044C \u0440\u0430\u0441\u043A\u0440\u044B\u0432\u0430\u044E\u0449\u0438\u0439\u0441\u044F \u0441\u043F\u0438\u0441\u043E\u043A \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044E \u0438\u0437\u043C\u0435\u043D\u044F\u0442\u044C \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u043C\u044B\u0445 \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0435.
 rendering.macro.liveData.parameter.pageSizes.name=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0442\u0440\u0430\u043D\u0438\u0446
 rendering.macro.liveData.parameter.pageSizes.description=\u0420\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0437\u0430\u043F\u044F\u0442\u044B\u043C\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446 \u0434\u043B\u044F \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u0432 \u0440\u0430\u0441\u043A\u0440\u044B\u0432\u0430\u044E\u0449\u0435\u043C\u0441\u044F \u0441\u043F\u0438\u0441\u043A\u0435.
+rendering.macro.liveData.parameter.description.name=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+rendering.macro.liveData.parameter.description.description=\u041D\u0435\u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u0435 \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 "\u0416\u0438\u0432\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445".
 
 #
 # Translation keys for the live data widget.
@@ -100,7 +102,9 @@ livedata.pagination.next=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F
 livedata.pagination.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u044F\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
 livedata.action.refresh=\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C
 livedata.action.addEntry=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u044C
-livedata.action.resizeColumn.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0440\u0430\u0437\u043C\u0435\u0440. \u0414\u0432\u0430\u0436\u0434\u044B \u0449\u0435\u043B\u043A\u043D\u0438\u0442\u0435 \u0434\u043B\u044F \u0441\u0431\u0440\u043E\u0441\u0430.
+livedata.action.columnName.default.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438 \u0441\u043E \u0441\u0442\u0440\u0435\u043B\u043A\u0430\u043C\u0438, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0440\u044F\u0434\u043E\u043A \u0440\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u044D\u0442\u043E\u0433\u043E \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430.
+livedata.action.columnName.sortable.hint=\u041D\u0430\u0436\u043C\u0438\u0442\u0435, \u0447\u0442\u043E\u0431\u044B \u043E\u0442\u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438 \u043F\u043E \u044D\u0442\u043E\u043C\u0443 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0443. \u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438 \u0441\u043E \u0441\u0442\u0440\u0435\u043B\u043A\u0430\u043C\u0438, \u0447\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0440\u044F\u0434\u043E\u043A.
+livedata.action.resizeColumn.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438 \u0441\u043E \u0441\u0442\u0440\u0435\u043B\u043A\u0430\u043C\u0438 \u0434\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0440\u0430\u0437\u043C\u0435\u0440\u0430. \u0427\u0442\u043E\u0431\u044B \u0441\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0440\u0430\u0437\u043C\u0435\u0440, \u0434\u0432\u0430\u0436\u0434\u044B \u0449\u0435\u043B\u043A\u043D\u0438\u0442\u0435 \u0438\u043B\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0443 escape.
 livedata.panel.filter.title=\u0424\u0438\u043B\u044C\u0442\u0440
 livedata.panel.filter.noneFilterable=\u041D\u0438 \u043E\u0434\u043D\u043E \u0438\u0437 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u043C\u044B\u0445 \u0441\u0432\u043E\u0439\u0441\u0442\u0432 \u043D\u0435 \u0444\u0438\u043B\u044C\u0442\u0440\u0443\u0435\u0442\u0441\u044F.
 livedata.panel.filter.addConstraint=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435
@@ -144,3 +148,4 @@ livedata.action.reorder.hint=\u041F\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0
 
 ## Used to indicate where deprecated keys end
 #@deprecatedend
+

From d73fabcd58e72cfb44e31cc44c7358710bee5ced Mon Sep 17 00:00:00 2001
From: Gankov Andrey <gav@qsolution.ru>
Date: Sat, 27 Jan 2024 07:47:23 +0000
Subject: [PATCH 066/143] Translated using Weblate (Russian)

Currently translated at 100.0% (5 of 5 strings)

Translation: XWiki Platform/xwiki-platform-refactoring-ui
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-refactoring-ui/ru/
---
 .../Code/RefactoringTranslations.ru.xml       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml
index 8b137891791f..b31fbbe901ec 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/src/main/resources/Refactoring/Code/RefactoringTranslations.ru.xml
@@ -1 +1,45 @@
+<?xml version="1.1" encoding="UTF-8"?>
 
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<xwikidoc version="1.4" reference="Refactoring.Code.RefactoringTranslations" locale="ru">
+  <web>Refactoring.Code</web>
+  <name>RefactoringTranslations</name>
+  <language>ru</language>
+  <defaultLanguage>en</defaultLanguage>
+  <translation>1</translation>
+  <creator>xwiki:XWiki.Admin</creator>
+  <parent>Refactoring.Code.WebHome</parent>
+  <author>xwiki:XWiki.Admin</author>
+  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
+  <version>1.1</version>
+  <title>RefactoringTranslations</title>
+  <comment/>
+  <minorEdit>false</minorEdit>
+  <syntaxId>plain/1.0</syntaxId>
+  <hidden>true</hidden>
+  <content>refactoring.configuration.delete.heading=Удаление свойств
+admin.delete=Удалить
+Refactoring.Code.RefactoringConfigurationClass_isRecycleBinSkippingActivated=Могут игнорировать мусорную корзину
+Refactoring.Code.RefactoringConfigurationClass_isRecycleBinSkippingActivated.hint=Если установлено значение Да, продвинутые пользователи могут выбирать, отправлять ли страницы в корзину или удалять их навсегда при удалении страниц. Если установлено значение Нет, страницы всегда отправляются в корзину, если она активна, в противном случае они всегда удаляются безвозвратно. По умолчанию установлено значение Нет.
+refactoring.configuration.delete.emptySection=В этом разделе настраивать нечего.
+</content>
+  </xwikidoc>

From e73b4db7e5c6b1d9a9afa586a443fa34ee722e72 Mon Sep 17 00:00:00 2001
From: Oana-Lavinia Florean <florean.lavinia@gmail.com>
Date: Mon, 29 Jan 2024 14:36:09 +0100
Subject: [PATCH 067/143] [release] Removed revapi ignores from the previous
 version

---
 xwiki-platform-core/pom.xml | 84 ++-----------------------------------
 1 file changed, 3 insertions(+), 81 deletions(-)

diff --git a/xwiki-platform-core/pom.xml b/xwiki-platform-core/pom.xml
index e1832293e0f7..f9d92a43e7a9 100644
--- a/xwiki-platform-core/pom.xml
+++ b/xwiki-platform-core/pom.xml
@@ -125,87 +125,9 @@
 
                  Single justification example:
             -->
-            <revapi.differences>
-              <justification>Those APIs are still available with legacy packages.</justification>
-              <criticality>allowed</criticality>
-              <differences>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.XWiki::addTooltip(java.lang.String, java.lang.String, com.xpn.xwiki.XWikiContext)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.XWiki::addTooltip(java.lang.String, java.lang.String, java.lang.String, com.xpn.xwiki.XWikiContext)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.XWiki::addTooltipJS(com.xpn.xwiki.XWikiContext)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.api.Document::displayTooltip(java.lang.String)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.api.Document::displayTooltip(java.lang.String, com.xpn.xwiki.api.Object)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.doc.XWikiDocument::displayTooltip(java.lang.String, com.xpn.xwiki.XWikiContext)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.doc.XWikiDocument::displayTooltip(java.lang.String, com.xpn.xwiki.objects.BaseObject, com.xpn.xwiki.XWikiContext)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.api.XWiki::addTooltip(java.lang.String, java.lang.String)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.api.XWiki::addTooltip(java.lang.String, java.lang.String, java.lang.String)</old>
-                </item>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.method.removed</code>
-                  <old>method java.lang.String com.xpn.xwiki.api.XWiki::addTooltipJS()</old>
-                </item>
-              </differences>
-            </revapi.differences>
-            <revapi.differences>
-              <differences>
-                <item>
-                  <criticality>allowed</criticality>
-                  <code>java.class.nonFinalClassInheritsFromNewClass</code>
-                  <old>class org.xwiki.filter.instance.output.DocumentInstanceOutputProperties</old>
-                  <new>class org.xwiki.filter.instance.output.DocumentInstanceOutputProperties</new>
-                  <superClass>org.xwiki.filter.instance.output.EntityInstanceOutputProperties</superClass>
-                  <justification>Not a breakage, the old DocumentInstanceOutputProperties content has been moved to the new EntityInstanceOutputProperties class and old class now inherits from the new one</justification>
-                </item>
-              </differences>
-            </revapi.differences>
-            <revapi.differences>
-              <differences>
-                <item>
-                  <ignore>true</ignore>
-                  <code>java.class.nonFinalClassInheritsFromNewClass</code>
-                  <old>class org.xwiki.livedata.macro.LiveDataMacroParameters</old>
-                  <new>class org.xwiki.livedata.macro.LiveDataMacroParameters</new>
-                  <superClass>org.xwiki.livedata.internal.LiveDataRendererParameters</superClass>
-                  <justification>Not a runtime breaking change.</justification>
-                  <criticality>allowed</criticality>
-                </item>
-              </differences>
-            </revapi.differences>
+            
+            
+            
           </analysisConfiguration>
         </configuration>
       </plugin>

From f1c6bf4bb99337c82290beccd11c3108d772d7a8 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 29 Jan 2024 16:58:42 +0100
Subject: [PATCH 068/143] XWIKI-21838: Various DocumentRenamedEvent listener
 are not properly cluster aware

---
 .../internal/DeletedEntityLikeListener.java   |  8 +----
 .../DeletedEntityLikeListenerTest.java        | 12 -------
 .../internal/DocumentMovedListener.java       |  6 ++--
 .../internal/RatingMovedEntityListener.java   | 34 +++++++------------
 4 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/main/java/org/xwiki/like/internal/DeletedEntityLikeListener.java b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/main/java/org/xwiki/like/internal/DeletedEntityLikeListener.java
index 5499950d3e0a..3a39dae452e7 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/main/java/org/xwiki/like/internal/DeletedEntityLikeListener.java
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/main/java/org/xwiki/like/internal/DeletedEntityLikeListener.java
@@ -36,7 +36,6 @@
 import org.xwiki.observation.AbstractEventListener;
 import org.xwiki.observation.EventListener;
 import org.xwiki.observation.event.Event;
-import org.xwiki.refactoring.event.DocumentRenamedEvent;
 
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.internal.event.XObjectDeletedEvent;
@@ -52,7 +51,6 @@
  *     <li>deletion of users</li>
  * </ul>
  *
- * Note that this component also listen to rename of documents.
  * The deletion of a documents will perform a partial clean of cache, to remove the information related to that
  * document (see {@link LikeManager#clearCache(EntityReference)}), while the other kinds lead to full clean of the
  * cache (see {@link LikeManager#clearCache()}).
@@ -70,8 +68,7 @@ public class DeletedEntityLikeListener extends AbstractEventListener
     private static final List<Event> EVENT_LIST = Arrays.asList(
         new DocumentDeletedEvent(),
         new WikiDeletedEvent(),
-        new XObjectDeletedEvent(BaseObjectReference.any(XWikiUsersDocumentInitializer.CLASS_REFERENCE_STRING)),
-        new DocumentRenamedEvent()
+        new XObjectDeletedEvent(BaseObjectReference.any(XWikiUsersDocumentInitializer.CLASS_REFERENCE_STRING))
     );
 
     @Inject
@@ -91,9 +88,6 @@ public void onEvent(Event event, Object source, Object data)
         if (event instanceof DocumentDeletedEvent) {
             XWikiDocument sourceDoc = (XWikiDocument) source;
             this.likeManagerProvider.get().clearCache(sourceDoc.getDocumentReference());
-        } else if (event instanceof DocumentRenamedEvent) {
-            DocumentRenamedEvent documentRenamedEvent = (DocumentRenamedEvent) event;
-            this.likeManagerProvider.get().clearCache(documentRenamedEvent.getSourceReference());
         } else {
             this.likeManagerProvider.get().clearCache();
         }
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/test/java/org/xwiki/like/internal/DeletedEntityLikeListenerTest.java b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/test/java/org/xwiki/like/internal/DeletedEntityLikeListenerTest.java
index 739b4365ea45..1822d7f40f36 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/test/java/org/xwiki/like/internal/DeletedEntityLikeListenerTest.java
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/src/test/java/org/xwiki/like/internal/DeletedEntityLikeListenerTest.java
@@ -27,7 +27,6 @@
 import org.xwiki.bridge.event.WikiDeletedEvent;
 import org.xwiki.like.LikeManager;
 import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.refactoring.event.DocumentRenamedEvent;
 import org.xwiki.test.junit5.mockito.ComponentTest;
 import org.xwiki.test.junit5.mockito.InjectMockComponents;
 import org.xwiki.test.junit5.mockito.MockComponent;
@@ -73,17 +72,6 @@ void onEventDeletedDocument()
         verify(this.likeManager).clearCache(documentReference);
     }
 
-    @Test
-    void onEventRenamedDocument()
-    {
-        DocumentRenamedEvent documentRenamedEvent = mock(DocumentRenamedEvent.class);
-        DocumentReference documentReference = mock(DocumentReference.class);
-        when(documentRenamedEvent.getSourceReference()).thenReturn(documentReference);
-
-        this.listener.onEvent(documentRenamedEvent, null, null);
-        verify(this.likeManager).clearCache(documentReference);
-    }
-
     @Test
     void onEventWiki()
     {
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/DocumentMovedListener.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/DocumentMovedListener.java
index 0f3f20597297..3767531cb4e0 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/DocumentMovedListener.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/DocumentMovedListener.java
@@ -30,7 +30,7 @@
 import org.xwiki.model.namespace.WikiNamespace;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReferenceSerializer;
-import org.xwiki.observation.AbstractEventListener;
+import org.xwiki.observation.event.AbstractLocalEventListener;
 import org.xwiki.observation.event.Event;
 import org.xwiki.refactoring.event.DocumentRenamedEvent;
 import org.xwiki.wiki.descriptor.WikiDescriptorManager;
@@ -48,7 +48,7 @@
 @Component
 @Named(DocumentMovedListener.NAME)
 @Singleton
-public class DocumentMovedListener extends AbstractEventListener
+public class DocumentMovedListener extends AbstractLocalEventListener
 {
     /**
      * Name of the component.
@@ -90,7 +90,7 @@ public DocumentMovedListener()
     }
 
     @Override
-    public void onEvent(Event event, Object source, Object data)
+    public void processLocalEvent(Event event, Object source, Object data)
     {
         DocumentRenamedEvent renamedEvent = (DocumentRenamedEvent) event;
         DocumentReference sourceLocation = renamedEvent.getSourceReference();
diff --git a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/RatingMovedEntityListener.java b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/RatingMovedEntityListener.java
index 4d550a66ffc3..207eec978b8c 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/RatingMovedEntityListener.java
+++ b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/src/main/java/org/xwiki/ratings/internal/RatingMovedEntityListener.java
@@ -19,9 +19,6 @@
  */
 package org.xwiki.ratings.internal;
 
-import java.util.Collections;
-import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -31,7 +28,7 @@
 import org.xwiki.component.annotation.Component;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReference;
-import org.xwiki.observation.AbstractEventListener;
+import org.xwiki.observation.event.AbstractLocalEventListener;
 import org.xwiki.observation.event.Event;
 import org.xwiki.ratings.RatingsException;
 import org.xwiki.ratings.RatingsManager;
@@ -50,12 +47,9 @@
 @Component
 @Singleton
 @Named(RatingMovedEntityListener.NAME)
-public class RatingMovedEntityListener extends AbstractEventListener
+public class RatingMovedEntityListener extends AbstractLocalEventListener
 {
     static final String NAME = "RatingMovedEntityListener";
-    private static final List<Event> EVENT_LIST = Collections.singletonList(
-        new DocumentRenamedEvent()
-    );
 
     @Inject
     private Logger logger;
@@ -68,25 +62,23 @@ public class RatingMovedEntityListener extends AbstractEventListener
      */
     public RatingMovedEntityListener()
     {
-        super(NAME, EVENT_LIST);
+        super(NAME, new DocumentRenamedEvent());
     }
 
     @Override
-    public void onEvent(Event event, Object source, Object data)
+    public void processLocalEvent(Event event, Object source, Object data)
     {
-        if (event instanceof DocumentRenamedEvent) {
-            DocumentRenamedEvent renamedEvent = (DocumentRenamedEvent) event;
-            DocumentReference oldReference = renamedEvent.getSourceReference();
-            DocumentReference newReference = renamedEvent.getTargetReference();
+        DocumentRenamedEvent renamedEvent = (DocumentRenamedEvent) event;
+        DocumentReference oldReference = renamedEvent.getSourceReference();
+        DocumentReference newReference = renamedEvent.getTargetReference();
 
-            try {
-                for (RatingsManager manager : this.ratingsManagerFactory.getInstantiatedManagers()) {
-                    manager.moveRatings(oldReference, newReference);
-                }
-            } catch (RatingsException e) {
-                logger.error("Error while updating ratings related to old reference [{}] from ratings: [{}]",
-                    oldReference, ExceptionUtils.getRootCause(e));
+        try {
+            for (RatingsManager manager : this.ratingsManagerFactory.getInstantiatedManagers()) {
+                manager.moveRatings(oldReference, newReference);
             }
+        } catch (RatingsException e) {
+            logger.error("Error while updating ratings related to old reference [{}] from ratings: [{}]", oldReference,
+                ExceptionUtils.getRootCause(e));
         }
     }
 }

From 8bdb7083958cc7cd80cd49e7913e169b5ae0c975 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 30 Jan 2024 10:11:41 +0100
Subject: [PATCH 069/143] XWIKI-21839: Upgrade to Testcontainers 1.19.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e036eb5df486..09d773422763 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <zookeeper.version>3.9.1</zookeeper.version>
 
     <!-- Versions of other software we need in our functional tests -->
-    <testcontainers.version>1.19.3</testcontainers.version>
+    <testcontainers.version>1.19.4</testcontainers.version>
     <!-- The LO version must point to the latest version from "Still" branch (LTS). When upgrading the version make
          sure the new version is available from https://download.documentfoundation.org/libreoffice/stable/
          Note: We don't need to exact version (e.g. 7.2.7.2) since the LTS is made available using a max of 2 dots

From f8affb647c58c8964419e4d9d53ee4ab396b86ee Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 30 Jan 2024 10:38:49 +0100
Subject: [PATCH 070/143] XWIKI-21840: Upgrade to MySQL connector 8.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 09d773422763..5ca860fdf509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
     <hsqldb.version>2.7.2</hsqldb.version>
     <mysql.groupId>com.mysql</mysql.groupId>
     <mysql.artifactId>mysql-connector-j</mysql.artifactId>
-    <mysql.version>8.2.0</mysql.version>
+    <mysql.version>8.3.0</mysql.version>
     <mariadb.groupId>org.mariadb.jdbc</mariadb.groupId>
     <mariadb.artifactId>mariadb-java-client</mariadb.artifactId>
     <mariadb.version>3.3.2</mariadb.version>

From 9a9718a69d204a52177b0ec56aa9ca34ef2f4598 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Tue, 30 Jan 2024 12:20:38 +0200
Subject: [PATCH 071/143] XWIKI-21803: Unescaped '<' (less than symbol) in
 in-line style breaks the WYSIWYG editor * Escape '<' in the content of style
 tags both for the editor HTML input and output, to overcome a bug in
 CKEditor's HTML parser. * Allow style tags (inside macro output), they were
 filtered out before by CKEditor's Advanced Content Filter * Add functional
 test * Rename some functional tests to be consisten.

(cherry picked from commit 0f794c9e7f97995028661d20c18c4793933a56c9)
---
 .../src/main/webjar/xwiki-filter/plugin.js    | 34 ++++++++
 .../it/org/xwiki/ckeditor/test/ui/AllIT.java  | 17 ++--
 .../org/xwiki/ckeditor/test/ui/FilterIT.java  | 84 +++++++++++++++++++
 .../ui/{ImagePluginIT.java => ImageIT.java}   |  2 +-
 .../ui/{LinkPluginIT.java => LinkIT.java}     |  2 +-
 .../src/main/webjar/config.js                 |  2 +-
 6 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java
 rename xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/{ImagePluginIT.java => ImageIT.java} (99%)
 rename xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/{LinkPluginIT.java => LinkIT.java} (99%)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js
index 9d33e3615ef1..a9f476f596a2 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js
@@ -26,6 +26,7 @@
  *   <li>submits only the significant content</li>
  *   <li>converts the font tags into span tags</li>
  *   <li>unprotect allowed scripts</li>
+ *   <li>escapes the content of style tags to avoid breaking the HTML parser</li>
  * </ul>
  *
  * @see http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Data_Processor
@@ -162,6 +163,12 @@
         htmlFilter.addRules(submitOnlySignificantContent, {priority: 5, applyToAll: true});
       }
 
+      // We have to filter both the input HTML (toHtml) and the output HTML (toDataFormat) because the CKEditor HTML
+      // parser is called in both cases. Priority 1 is needed to ensure our listener is called before the HTML parser
+      // (which has priority 5).
+      editor.on('toHtml', escapeStyleContent, null, null, 1);
+      editor.on('toDataFormat', escapeStyleContent, null, null, 1);
+
       // Transform <font color="..." face="..."> into <span style="color: ...; font-family: ...">.
       // See https://ckeditor.com/old//comment/125305#comment-125305
       editor.filter.addTransformations([
@@ -310,4 +317,31 @@
       }
     }
   });
+
+  const domParser = new DOMParser();
+  function escapeStyleContent(event) {
+    let html = event.data.dataValue;
+    // Depending on the editor type (inline or iframe-based) and configuration (fullPage true or false) the HTML
+    // string can be a full HTML document or just a fragment (e.g. the content of the BODY tag).
+    const isFragment = !html.trimEnd().endsWith('</html>');
+    try {
+      const doc = domParser.parseFromString(html, 'text/html');
+      // We want to modify the input HTML string only if there is a style tag that need escaping.
+      let modified = false;
+      doc.querySelectorAll('style').forEach(style => {
+        const styleContent = style.textContent;
+        // Escaping the '<' (less than) character in the style content is normally not required but unfortunately
+        // CKEditor's HTML parser relies heavily on regular expressions to match the start / end tags and considers
+        // the '<' character as the start of a new tag, even when '<' is used inside CSS (e.g. with the content
+        // property). See https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser.html
+        style.textContent = styleContent.replaceAll('<', '\\3C');
+        modified = modified || (styleContent !== style.textContent);
+      });
+      if (modified) {
+        event.data.dataValue = isFragment ? doc.body.innerHTML : doc.documentElement.outerHTML;
+      }
+    } catch (e) {
+      console.warn('Failed to escape the style tags from the given HTML string: ' + html, e);
+    }
+  }
 })();
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java
index 2f5379a3189e..40a776b7190e 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java
@@ -39,20 +39,20 @@ class NestedSaveIT extends SaveIT
     }
 
     @Nested
-    @DisplayName("Image Plugin")
-    class NestedImagePluginIT extends ImagePluginIT
+    @DisplayName("Image")
+    class NestedImageIT extends ImageIT
     {
     }
 
     @Nested
-    @DisplayName("TextArea Editor")
+    @DisplayName("TextArea Property Editor")
     class NestedTextAreaIT extends TextAreaIT
     {
     }
 
     @Nested
-    @DisplayName("Link Plugin")
-    class NestedLinkPluginIT extends LinkPluginIT
+    @DisplayName("Link")
+    class NestedLinkIT extends LinkIT
     {
     }
     
@@ -73,5 +73,10 @@ class NestedUndoRedoIT extends UndoRedoIT
     class NestedLocalizationIT extends LocalizationIT
     {
     }
-    
+
+    @Nested
+    @DisplayName("Filter")
+    class NestedFilterIT extends FilterIT
+    {
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java
new file mode 100644
index 000000000000..9f10536110a0
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java
@@ -0,0 +1,84 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.ckeditor.test.ui;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.xwiki.test.docker.junit5.TestReference;
+import org.xwiki.test.docker.junit5.UITest;
+import org.xwiki.test.ui.TestUtils;
+
+/**
+ * Tests how CKEditor filters the content.
+ * 
+ * @version $Id$
+ */
+@UITest
+class FilterIT extends AbstractCKEditorIT
+{
+    @BeforeEach
+    void beforeEach(TestUtils setup, TestReference testReference)
+    {
+        edit(setup, testReference);
+    }
+
+    @AfterEach
+    void afterEach(TestUtils setup, TestReference testReference)
+    {
+        maybeLeaveEditMode(setup, testReference);
+    }
+
+    @Test
+    @Order(1)
+    void escapeStyleContent()
+    {
+        StringBuilder source = new StringBuilder();
+        source.append("before\n");
+        source.append("\n");
+        source.append("{{html clean=\"false\"}}\n");
+        source.append("<style>\n");
+        source.append("p::before {\n");
+        source.append("  content: '<';\n");
+        source.append("}\n");
+        source.append("</style>\n");
+        source.append("<div>inside</div>\n");
+        source.append("<style id=\"second\">\n");
+        source.append("div::after {\n");
+        source.append("  content: '<';\n");
+        source.append("}\n");
+        source.append("</style>\n");
+        source.append("{{/html}}\n");
+        source.append("\n");
+        source.append("after");
+
+        setSource(source.toString());
+        String html = this.textArea.getContent();
+        assertTrue(html.contains("<style>"), "Unexpected content: " + html);
+        assertTrue(html.contains("content: '<'"), "Unexpected content: " + html);
+
+        this.textArea.sendKeys(" end");
+        // Verify that the origial style content is preserved.
+        assertSourceContains(source.toString() + " end");
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImagePluginIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java
similarity index 99%
rename from xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImagePluginIT.java
rename to xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java
index 70e5157dc564..aa4f9db2006a 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImagePluginIT.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java
@@ -66,7 +66,7 @@
  * @since 14.7RC1
  */
 @UITest
-class ImagePluginIT extends AbstractCKEditorIT
+class ImageIT extends AbstractCKEditorIT
 {
     
     @BeforeAll
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkPluginIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkIT.java
similarity index 99%
rename from xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkPluginIT.java
rename to xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkIT.java
index 552c7256d7f2..aa98b2745e2b 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkPluginIT.java
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/LinkIT.java
@@ -42,7 +42,7 @@
 @UITest(extraJARs = {
     "org.xwiki.platform:xwiki-platform-search-solr-query"
 })
-class LinkPluginIT extends AbstractCKEditorIT
+class LinkIT extends AbstractCKEditorIT
 {
     @BeforeAll
     void beforeAll(TestUtils setup, TestConfiguration testConfiguration) throws Exception
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
index 6b101034b64e..d0db49f60d29 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
@@ -26,7 +26,7 @@ CKEDITOR.editorConfig = function(config) {
       '$1': {
         elements: {
           // Elements required because the editor input is a full HTML page.
-          html: true, head: true, link: true, script: true, body: true,
+          html: true, head: true, link: true, script: true, style: true, body: true,
           // Headings
           h1: true, h2: true, h3: true, h4: true, h5: true, h6: true,
           // Lists

From e80dcb59f2f8347b2d3cd24ded3d260ceacf6a3b Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 30 Jan 2024 17:34:13 +0100
Subject: [PATCH 072/143] XWIKI-21812: Introduce a
 (XWiki)Document#setAuthor(AuthorReference) helper covering most use case of
 document author set

---
 .../main/java/com/xpn/xwiki/api/Document.java |  27 ++
 .../java/com/xpn/xwiki/doc/XWikiDocument.java | 233 +++++++++---------
 .../DocumentInstanceOutputFilterStream.java   |   5 +-
 .../java/com/xpn/xwiki/web/EditAction.java    |   3 +-
 .../java/com/xpn/xwiki/web/SaveAction.java    |   7 +-
 .../com/xpn/xwiki/web/SaveActionTest.java     |   6 +-
 6 files changed, 153 insertions(+), 128 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/Document.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/Document.java
index 8da93f4107c9..8da5141bf20d 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/Document.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/Document.java
@@ -53,6 +53,7 @@
 import org.xwiki.rendering.block.XDOM;
 import org.xwiki.rendering.parser.ParseException;
 import org.xwiki.rendering.syntax.Syntax;
+import org.xwiki.security.authorization.AccessDeniedException;
 import org.xwiki.security.authorization.AuthorizationException;
 import org.xwiki.security.authorization.Right;
 import org.xwiki.stability.Unstable;
@@ -2127,6 +2128,7 @@ public boolean hasAccessLevel(String level, String user)
      * @return {@code true} if the user has the specified right on this document, {@code false} otherwise
      * @since 10.6RC1
      */
+    @Override
     public boolean hasAccess(Right right, DocumentReference userReference)
     {
         return getAuthorizationManager().hasAccess(right, userReference, getDocumentReference());
@@ -3311,4 +3313,29 @@ public DocumentAuthors getAuthors()
             return new SafeDocumentAuthors(this.doc.getAuthors());
         }
     }
+
+    /**
+     * You need to have programming right to use this API.
+     * <p>
+     * Update the author of the document. It's the recommended way to update it if you don't fully understand the
+     * various types of authors exposed by {@link #getAuthor()}.
+     * <p>
+     * What will happen in practice is the following:
+     * <ul>
+     * <li>the effective and original metadata authors are set to the passed reference</li>
+     * <li>when saving the document, if the content is modified (the content dirty flag is true) then the content author
+     * will also be updated to the passed reference</li>
+     * </ul>
+     * 
+     * @param userReference the reference of the new author of the document
+     * @throws AccessDeniedException when the current author is not allowed to use this API
+     * @since 16.1.0RC1
+     */
+    @Unstable
+    public void setAuthor(UserReference userReference) throws AccessDeniedException
+    {
+        getContextualAuthorizationManager().checkAccess(Right.PROGRAM);
+
+        getDoc().setAuthor(userReference);
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
index ae71841fcb55..0f0546ed7d90 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
@@ -420,7 +420,8 @@ private static SyntaxRegistry getSyntaxRegistry()
     /**
      * Used to retrieve backlinks from an XDOM.
      */
-    private static LinkParser getLinkParser() {
+    private static LinkParser getLinkParser()
+    {
         return Utils.getComponent(LinkParser.class);
     }
 
@@ -583,7 +584,7 @@ public List<BaseObject> remove(Object key)
         @Override
         public void clear()
         {
-            xObjects.clear();            
+            xObjects.clear();
         }
 
         @Override
@@ -742,6 +743,7 @@ public Set<Entry<DocumentReference, List<BaseObject>>> entrySet()
     /**
      * Create a document for the given reference, with the {@link Locale#ROOT} even if the reference contains a locale.
      * If you want to create a document for another locale, use {@link #XWikiDocument(DocumentReference, Locale)}.
+     * 
      * @since 2.2M1
      */
     public XWikiDocument(DocumentReference reference)
@@ -959,7 +961,7 @@ private UserReferenceSerializer<String> getUserReferenceCompactWikiSerializer()
 
     private LinkStore getLinkStore()
     {
-        return Utils.getComponent(LinkStore.class);        
+        return Utils.getComponent(LinkStore.class);
     }
 
     public XWikiStoreInterface getStore(XWikiContext context)
@@ -1393,11 +1395,11 @@ public String getRenderedContent(boolean transformationContextIsolated, XWikiCon
     }
 
     /**
-     * Execute and render the current document in the current context.
-     * The code is executed with right of this document content author.
+     * Execute and render the current document in the current context. The code is executed with right of this document
+     * content author.
      *
-     * @param context  the XWiki Context object
-     * @return  the rendered content of the document or its translation.
+     * @param context the XWiki Context object
+     * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      * @since 11.3RC1
      */
@@ -1407,12 +1409,12 @@ public String displayDocument(XWikiContext context) throws XWikiException
     }
 
     /**
-     * Execute and render the current document in the current context.
-     * The code is executed with right of this document content author.
+     * Execute and render the current document in the current context. The code is executed with right of this document
+     * content author.
      *
-     * @param context  the XWiki Context object
+     * @param context the XWiki Context object
      * @param restricted see {@link DocumentDisplayerParameters#isTransformationContextRestricted}.
-     * @return  the rendered content of the document or its translation.
+     * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      * @since 11.5RC1
      */
@@ -1422,12 +1424,12 @@ public String displayDocument(boolean restricted, XWikiContext context) throws X
     }
 
     /**
-     * Execute and render the current document in the current context.
-     * The code is executed with right of this document content author.
+     * Execute and render the current document in the current context. The code is executed with right of this document
+     * content author.
      *
-     * @param targetSyntax  the syntax to use to render the document
-     * @param context  the XWiki Context object
-     * @return  the rendered content of the document or its translation.
+     * @param targetSyntax the syntax to use to render the document
+     * @param context the XWiki Context object
+     * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      * @since 11.3RC1
      */
@@ -1437,13 +1439,13 @@ public String displayDocument(Syntax targetSyntax, XWikiContext context) throws
     }
 
     /**
-     * Execute and render the current document in the current context.
-     * The code is executed with right of this document content author.
+     * Execute and render the current document in the current context. The code is executed with right of this document
+     * content author.
      *
-     * @param targetSyntax  the syntax to use to render the document
-     * @param context  the XWiki Context object
+     * @param targetSyntax the syntax to use to render the document
+     * @param context the XWiki Context object
      * @param restricted see {@link DocumentDisplayerParameters#isTransformationContextRestricted}.
-     * @return  the rendered content of the document or its translation.
+     * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      * @since 11.5RC1
      */
@@ -1453,15 +1455,14 @@ public String displayDocument(Syntax targetSyntax, boolean restricted, XWikiCont
     }
 
     /**
-     * Execute and render the document or its translation in the current context.
-     * The code is executed with right of this document (or the translation) content author.
-     * The translations are retrieved if they exist and based on XWiki preferences
-     * (see {@link #getTranslatedDocument(XWikiContext)}).
+     * Execute and render the document or its translation in the current context. The code is executed with right of
+     * this document (or the translation) content author. The translations are retrieved if they exist and based on
+     * XWiki preferences (see {@link #getTranslatedDocument(XWikiContext)}).
      *
-     * @param targetSyntax  the syntax to use to render the document
+     * @param targetSyntax the syntax to use to render the document
      * @param transformationContextIsolated see {@link DocumentDisplayerParameters#isTransformationContextIsolated()}
-     * @param context  the XWiki Context object
-     * @return  the rendered content of the document or its translation.
+     * @param context the XWiki Context object
+     * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      */
     public String getRenderedContent(Syntax targetSyntax, boolean transformationContextIsolated, XWikiContext context)
@@ -1471,15 +1472,15 @@ public String getRenderedContent(Syntax targetSyntax, boolean transformationCont
     }
 
     /**
-     * Execute and render the document or its translation in the current context.
-     * The code is executed with right of this document (or the translation) content author.
+     * Execute and render the document or its translation in the current context. The code is executed with right of
+     * this document (or the translation) content author.
      *
      * @param targetSyntax the syntax to use to render the document
      * @param transformationContextIsolated see {@link DocumentDisplayerParameters#isTransformationContextIsolated()}
      * @param transformationContextRestricted see {@link DocumentDisplayerParameters#isTransformationContextRestricted}.
      * @param context the XWiki Context object
      * @param retrieveTranslation if true retrieve the translation of the document according to the preferences (see
-     *  {@link #getTranslatedDocument(XWikiContext)}). If false, render the current document.
+     *            {@link #getTranslatedDocument(XWikiContext)}). If false, render the current document.
      * @return the rendered content of the document or its translation.
      * @throws XWikiException in case of error during the rendering.
      */
@@ -1687,8 +1688,7 @@ public String getRenderedContent(String text, Syntax sourceSyntaxId, Syntax targ
 
             // We don't let displayer take care of the context isolation because we don't want the fake document to be
             // context document
-            return fakeDocument.display(targetSyntaxId, false, isolated, restrictedTransformationContext,
-                false);
+            return fakeDocument.display(targetSyntaxId, false, isolated, restrictedTransformationContext, false);
         } catch (Exception e) {
             // Failed to render for some reason. This method should normally throw an exception but this
             // requires changing the signature of calling methods too.
@@ -1805,8 +1805,8 @@ public String getPrefixedFullName()
 
     /**
      * @since 2.2M1
-     * @deprecated don't change the reference of a document once it's been constructed. Instead you can
-     *             clone the doc, rename it or copy it.
+     * @deprecated don't change the reference of a document once it's been constructed. Instead you can clone the doc,
+     *             rename it or copy it.
      */
     @Deprecated(since = "2.2.3")
     public void setDocumentReference(DocumentReference reference)
@@ -2073,7 +2073,7 @@ public DocumentReference getAuthorReference()
     /**
      * @since 3.0M3
      * @deprecated use {@link #getAuthors()} and then {@link DocumentAuthors#setEffectiveMetadataAuthor(UserReference)}
-     * instead
+     *             instead
      */
     @Deprecated(since = "14.0RC1")
     public void setAuthorReference(DocumentReference authorReference)
@@ -2326,8 +2326,8 @@ public boolean isContentDirty()
     }
 
     /**
-     * Increment the current document version.
-     * This method will use {@link #getNextVersion(Version, boolean)} to compute the new version.
+     * Increment the current document version. This method will use {@link #getNextVersion(Version, boolean)} to compute
+     * the new version.
      */
     public void incrementVersion()
     {
@@ -2335,8 +2335,8 @@ public void incrementVersion()
     }
 
     /**
-     * This method computes the next version and returns it, but won't change the current version.
-     * In order to change the current version, see {@link #incrementVersion()}.
+     * This method computes the next version and returns it, but won't change the current version. In order to change
+     * the current version, see {@link #incrementVersion()}.
      *
      * @param version the based version from which to compute the next one.
      * @param minorEdit true means it's a minor edition.
@@ -2529,8 +2529,8 @@ public com.xpn.xwiki.api.Document newDocument(Class<?> customClass, XWikiContext
     {
         if (customClass != null) {
             try {
-                Class<?>[] classes = new Class[] { XWikiDocument.class, XWikiContext.class };
-                Object[] args = new Object[] { this, context };
+                Class<?>[] classes = new Class[] {XWikiDocument.class, XWikiContext.class};
+                Object[] args = new Object[] {this, context};
 
                 return (com.xpn.xwiki.api.Document) customClass.getConstructor(classes).newInstance(args);
             } catch (Exception e) {
@@ -2920,12 +2920,12 @@ public int getObjectNumbers(String className)
     }
 
     /**
-     * Retrieve and returns all objects corresponding to the given class reference, or an empty list if there's none.
-     * Be aware that some elements of this list might be null since all objects are in the list at their real index.
+     * Retrieve and returns all objects corresponding to the given class reference, or an empty list if there's none. Be
+     * aware that some elements of this list might be null since all objects are in the list at their real index.
      *
      * @param classReference the reference of the xclass for which to retrieve the xobjects
-     * @return a list of xobjects and null elements (for deleted xobjects) corresponding to the given xclass
-     *          or an empty list.
+     * @return a list of xobjects and null elements (for deleted xobjects) corresponding to the given xclass or an empty
+     *         list.
      * @since 2.2M1
      */
     public List<BaseObject> getXObjects(DocumentReference classReference)
@@ -2941,12 +2941,12 @@ public List<BaseObject> getXObjects(DocumentReference classReference)
 
     /**
      * Retrieve and returns all objects corresponding to the class reference corresponding to the resolution of the
-     * given entity reference, or an empty list if there's none.
-     * Be aware that some elements of this list might be null since all objects are in the list at their real index.
+     * given entity reference, or an empty list if there's none. Be aware that some elements of this list might be null
+     * since all objects are in the list at their real index.
      *
      * @param reference the reference that is resolved to an xclass for retrieving the corresponding xobjects
-     * @return a list of xobjects and null elements (for deleted xobjects) corresponding to the given xclass
-     *           or an empty list.
+     * @return a list of xobjects and null elements (for deleted xobjects) corresponding to the given xclass or an empty
+     *         list.
      * @since 3.3M1
      */
     public List<BaseObject> getXObjects(EntityReference reference)
@@ -3581,8 +3581,6 @@ public String displayPrettyName(String fieldname, boolean showMandatory, boolean
         }
     }
 
-
-
     /**
      * @param fieldname the name of the field to display
      * @param context the XWiki context
@@ -3729,8 +3727,8 @@ public String display(String fieldname, String type, String pref, BaseObject obj
     public String display(String fieldname, String type, String pref, BaseObject obj, boolean isolated,
         XWikiContext context)
     {
-        return display(fieldname, type, pref, obj,
-            context.getWiki().getCurrentContentSyntaxId(getSyntaxId(), context), isolated, context);
+        return display(fieldname, type, pref, obj, context.getWiki().getCurrentContentSyntaxId(getSyntaxId(), context),
+            isolated, context);
     }
 
     /**
@@ -3769,7 +3767,7 @@ public String display(String fieldname, String type, String pref, BaseObject obj
 
         boolean isInRenderingEngine = BooleanUtils.toBoolean((Boolean) context.get("isInRenderingEngine"));
         HashMap<String, Object> backup = new HashMap<String, Object>();
-        XWikiDocument currentSDoc = (XWikiDocument )context.get(CKEY_SDOC);
+        XWikiDocument currentSDoc = (XWikiDocument) context.get(CKEY_SDOC);
         try {
             if (isolated) {
                 backupContext(backup, context);
@@ -3876,8 +3874,7 @@ public String display(String fieldname, String type, String pref, BaseObject obj
             // Add the {{html}}{{/html}} only when result really contains html or { which could be part of an XWiki
             // macro syntax since it's not needed for pure text
             if (isInRenderingEngine && !is10Syntax(wrappingSyntaxId)
-                && (HTMLUtils.containsElementText(result) || result.indexOf("{") != -1))
-            {
+                && (HTMLUtils.containsElementText(result) || result.indexOf("{") != -1)) {
                 result.insert(0, "{{html clean=\"false\" wiki=\"false\"}}");
                 // Escape closing HTML macro syntax.
                 int startIndex = 0;
@@ -3991,7 +3988,7 @@ private String evaluate(String content, String name, VelocityContext vcontext, X
             return writer.toString();
         } catch (Exception e) {
             LOGGER.error("Error while parsing velocity template namespace [{}]", name, e);
-            Object[] args = { name };
+            Object[] args = {name};
             XWikiException xe = new XWikiException(XWikiException.MODULE_XWIKI_RENDERING,
                 XWikiException.ERROR_XWIKI_RENDERING_VELOCITY_EXCEPTION, "Error while parsing velocity page {0}", e,
                 args);
@@ -4347,7 +4344,8 @@ private TemporaryAttachmentSessionsManager getTemporaryAttachmentManager()
      */
     public void readTemporaryUploadedFiles(EditForm editForm)
     {
-        getTemporaryAttachmentManager().attachTemporaryAttachmentsInDocument(this, editForm.getTemporaryUploadedFiles());
+        getTemporaryAttachmentManager().attachTemporaryAttachmentsInDocument(this,
+            editForm.getTemporaryUploadedFiles());
     }
 
     /**
@@ -4401,7 +4399,7 @@ public void readFromTemplate(DocumentReference templateDocumentReference, XWikiC
         if (templateDocumentReference != null) {
             String content = getContent();
             if (!content.equals("\n") && !content.equals("") && !isNew()) {
-                Object[] args = { getDefaultEntityReferenceSerializer().serialize(getDocumentReference()) };
+                Object[] args = {getDefaultEntityReferenceSerializer().serialize(getDocumentReference())};
                 throw new XWikiException(XWikiException.MODULE_XWIKI_STORE,
                     XWikiException.ERROR_XWIKI_APP_DOCUMENT_NOT_EMPTY,
                     "Cannot add a template to document {0} because it already has content", null, args);
@@ -4409,8 +4407,8 @@ public void readFromTemplate(DocumentReference templateDocumentReference, XWikiC
                 XWiki xwiki = context.getWiki();
                 XWikiDocument templatedoc = xwiki.getDocument(templateDocumentReference, context);
                 if (templatedoc.isNew()) {
-                    Object[] args = { getDefaultEntityReferenceSerializer().serialize(templateDocumentReference),
-                    getCompactEntityReferenceSerializer().serialize(getDocumentReference()) };
+                    Object[] args = {getDefaultEntityReferenceSerializer().serialize(templateDocumentReference),
+                        getCompactEntityReferenceSerializer().serialize(getDocumentReference())};
                     throw new XWikiException(XWikiException.MODULE_XWIKI_STORE,
                         XWikiException.ERROR_XWIKI_APP_TEMPLATE_DOES_NOT_EXIST,
                         "Template document {0} does not exist when adding to document {1}", null, args);
@@ -4523,8 +4521,7 @@ private void cloneDocumentArchive(XWikiDocument originalDocument) throws XWikiEx
         }
     }
 
-    private XWikiDocument cloneInternal(DocumentReference newDocumentReference,
-        boolean keepsIdentity,
+    private XWikiDocument cloneInternal(DocumentReference newDocumentReference, boolean keepsIdentity,
         boolean cloneArchive)
     {
         XWikiDocument doc = null;
@@ -5692,9 +5689,9 @@ private Set<DocumentReference> getUniqueLinkedPages10(XWikiContext context)
     }
 
     /**
-     * Extract all the unique entity references found in the current document (they can be wiki links, macro
-     * parameters, etc) and pointing to entities specified in the passed {@code entityTypes} map (the keys represent
-     * the entity references that will be returned).
+     * Extract all the unique entity references found in the current document (they can be wiki links, macro parameters,
+     * etc) and pointing to entities specified in the passed {@code entityTypes} map (the keys represent the entity
+     * references that will be returned).
      *
      * @param context the XWiki context
      * @param entityTypes the mapping of the types of references to return (and their corresponding resource types)
@@ -5791,8 +5788,8 @@ private Set<DocumentReference> toDocumentReferenceSet(Collection<? extends Entit
     }
 
     /**
-     * Extract all the unique entity references found in the current document (they can be wiki links, macro
-     * parameters, etc) and pointing to documents (either using a Document Reference or a Page Reference).
+     * Extract all the unique entity references found in the current document (they can be wiki links, macro parameters,
+     * etc) and pointing to documents (either using a Document Reference or a Page Reference).
      *
      * @param context the XWiki context
      * @return the serialized entity references, and null if an error happened
@@ -5801,15 +5798,9 @@ private Set<DocumentReference> toDocumentReferenceSet(Collection<? extends Entit
     public Set<String> getUniqueLinkedPages(XWikiContext context)
     {
         // Only return document references.
-        Set<EntityReference> references = getUniqueLinkedEntityReferences(context, Map.of(
-            EntityType.DOCUMENT, Set.of(
-                ResourceType.SPACE,
-                ResourceType.DOCUMENT,
-                ResourceType.ATTACHMENT),
-            EntityType.PAGE, Set.of(
-                ResourceType.PAGE,
-                ResourceType.PAGE_ATTACHMENT)
-        ));
+        Set<EntityReference> references = getUniqueLinkedEntityReferences(context,
+            Map.of(EntityType.DOCUMENT, Set.of(ResourceType.SPACE, ResourceType.DOCUMENT, ResourceType.ATTACHMENT),
+                EntityType.PAGE, Set.of(ResourceType.PAGE, ResourceType.PAGE_ATTACHMENT)));
         Set<String> documentNames = new LinkedHashSet<>(references.size());
 
         XWikiDocument contextDoc = context.getDoc();
@@ -5846,8 +5837,8 @@ public Set<String> getUniqueLinkedPages(XWikiContext context)
     }
 
     /**
-     * Extract all the unique static (i.e. not generated by macros) entity references pointed by wiki links (pointing
-     * to wiki document or attachments) for the current context document.
+     * Extract all the unique static (i.e. not generated by macros) entity references pointed by wiki links (pointing to
+     * wiki document or attachments) for the current context document.
      *
      * @param context the XWiki context
      * @return the entity references pointing to either document or attachments. If {@code null}, an error happened
@@ -5859,17 +5850,10 @@ public Set<EntityReference> getUniqueLinkedEntities(XWikiContext context)
         // Note that we return PAGE and PAGE_ATTACHMENT since it's not possible to convert them to DOCUMENT and
         // ATTACHMENT since there's no way of knowing (without querying the DB) if they point to a terminal page or
         // a non-terminal one (and thus the conversion would be wrong).
-        return getUniqueLinkedEntityReferences(context, Map.of(
-            EntityType.DOCUMENT, Set.of(
-                ResourceType.SPACE,
-                ResourceType.DOCUMENT),
-            EntityType.PAGE, Set.of(
-                ResourceType.PAGE),
-            EntityType.ATTACHMENT, Set.of(
-                ResourceType.ATTACHMENT),
-            EntityType.PAGE_ATTACHMENT, Set.of(
-                ResourceType.PAGE_ATTACHMENT)
-        ));
+        return getUniqueLinkedEntityReferences(context,
+            Map.of(EntityType.DOCUMENT, Set.of(ResourceType.SPACE, ResourceType.DOCUMENT), EntityType.PAGE,
+                Set.of(ResourceType.PAGE), EntityType.ATTACHMENT, Set.of(ResourceType.ATTACHMENT),
+                EntityType.PAGE_ATTACHMENT, Set.of(ResourceType.PAGE_ATTACHMENT)));
     }
 
     /**
@@ -6179,13 +6163,13 @@ public String displayHidden(PropertyClass pclass, String prefix, BaseCollection
     }
 
     /**
-     * Return the first attachment of the attachment list either exactly matching the provided filename or that matches 
+     * Return the first attachment of the attachment list either exactly matching the provided filename or that matches
      * the provided filename with a n arbitrary extension (i.e., filename.ext). To get only attachments that exactly
      * matches the provided filename use {@link #getExactAttachment(String)}.
      * 
      * @param filename the file name of the attachment with or without the extension
      * @return the {@link XWikiAttachment} corresponding to the file name, null if none can be found
-     * @see #getExactAttachment(String) 
+     * @see #getExactAttachment(String)
      */
     public XWikiAttachment getAttachment(String filename)
     {
@@ -6741,8 +6725,8 @@ public int getTranslation()
     /**
      * Note that this method cannot be removed for now since it's called by Hibernate when loading a XWikiDocument.
      *
-     * @deprecated stored in the database to speedup some queries (really ?) but in {@link XWikiDocument}
-     *             it's calculated based on the document locale
+     * @deprecated stored in the database to speedup some queries (really ?) but in {@link XWikiDocument} it's
+     *             calculated based on the document locale
      */
     @Deprecated(since = "5.4.6")
     public void setTranslation(int translation)
@@ -7278,8 +7262,8 @@ public XWikiDocument copyDocument(DocumentReference newDocumentReference, XWikiC
     /**
      * @since 14.3RC1
      */
-    public XWikiDocument copyDocument(DocumentReference newDocumentReference, boolean cloneArchive, XWikiContext context)
-        throws XWikiException
+    public XWikiDocument copyDocument(DocumentReference newDocumentReference, boolean cloneArchive,
+        XWikiContext context) throws XWikiException
     {
         loadAttachments(context);
         if (cloneArchive) {
@@ -7379,8 +7363,8 @@ public String getXClassXML()
     }
 
     /**
-     * @deprecated use {@link #getXClassXML()} instead as Hibernate uses this through reflection. It cannot be
-     *             removed without altering hibernate.cfg.xml
+     * @deprecated use {@link #getXClassXML()} instead as Hibernate uses this through reflection. It cannot be removed
+     *             without altering hibernate.cfg.xml
      */
     @Deprecated(since = "2.2M1")
     public String getxWikiClassXML()
@@ -7397,8 +7381,8 @@ public void setXClassXML(String xClassXML)
     }
 
     /**
-     * @deprecated use {@link #setXClassXML(String)} ()} instead as Hibernate uses this through reflection. It
-     *             cannot be removed without altering hibernate.cfg.xml
+     * @deprecated use {@link #setXClassXML(String)} ()} instead as Hibernate uses this through reflection. It cannot be
+     *             removed without altering hibernate.cfg.xml
      */
     @Deprecated(since = "2.2M1")
     public void setxWikiClassXML(String xClassXML)
@@ -8048,8 +8032,8 @@ public List<BaseObject> updateObjectsFromRequest(String className, String pref,
 
     public boolean isAdvancedContent()
     {
-        String[] matches = { "<%", "#set", "#include", "#if", "public class", "/* Advanced content */",
-        "## Advanced content", "/* Programmatic content */", "## Programmatic content" };
+        String[] matches = {"<%", "#set", "#include", "#if", "public class", "/* Advanced content */",
+            "## Advanced content", "/* Programmatic content */", "## Programmatic content"};
         String content2 = getContent().toLowerCase();
         for (String match : matches) {
             if (content2.indexOf(match.toLowerCase()) != -1) {
@@ -8066,11 +8050,11 @@ public boolean isAdvancedContent()
 
     public boolean isProgrammaticContent()
     {
-        String[] matches = { "<%", "\\$xwiki.xWiki", "$xcontext.context", "$doc.document", "$xwiki.getXWiki()",
-        "$xcontext.getContext()", "$doc.getDocument()", "WithProgrammingRights(", "/* Programmatic content */",
-        "## Programmatic content", "$xwiki.search(", "$xwiki.createUser", "$xwiki.createNewWiki",
-        "$xwiki.addToAllGroup", "$xwiki.sendMessage", "$xwiki.copyDocument", "$xwiki.copyWikiWeb",
-        "$xwiki.copySpaceBetweenWikis", "$xwiki.parseGroovyFromString", "$doc.toXML()", "$doc.toXMLDocument()", };
+        String[] matches = {"<%", "\\$xwiki.xWiki", "$xcontext.context", "$doc.document", "$xwiki.getXWiki()",
+            "$xcontext.getContext()", "$doc.getDocument()", "WithProgrammingRights(", "/* Programmatic content */",
+            "## Programmatic content", "$xwiki.search(", "$xwiki.createUser", "$xwiki.createNewWiki",
+            "$xwiki.addToAllGroup", "$xwiki.sendMessage", "$xwiki.copyDocument", "$xwiki.copyWikiWeb",
+            "$xwiki.copySpaceBetweenWikis", "$xwiki.parseGroovyFromString", "$doc.toXML()", "$doc.toXMLDocument()",};
         String content2 = getContent().toLowerCase();
         for (String match : matches) {
             if (content2.indexOf(match.toLowerCase()) != -1) {
@@ -9182,8 +9166,9 @@ private BaseObject prepareXObject(EntityReference classReference)
      * @param context the XWiki context
      * @return a repport of what happen during the merge (errors, etc.)
      * @since 3.2M1
-     * @deprecated use {@link MergeManager#mergeDocument(DocumentModelBridge, DocumentModelBridge, DocumentModelBridge,
-     *  MergeConfiguration)} instead
+     * @deprecated use
+     *             {@link MergeManager#mergeDocument(DocumentModelBridge, DocumentModelBridge, DocumentModelBridge, MergeConfiguration)}
+     *             instead
      */
     @Deprecated(since = "11.8RC1")
     public MergeResult merge(XWikiDocument previousDocument, XWikiDocument newDocument,
@@ -9197,8 +9182,7 @@ public MergeResult merge(XWikiDocument previousDocument, XWikiDocument newDocume
         mergeResult.getLog().addAll(mergeDocumentResult.getLog());
         mergeResult.setModified(mergeResult.isModified() || mergeDocumentResult.isModified());
 
-        if (!configuration.isProvidedVersionsModifiables())
-        {
+        if (!configuration.isProvidedVersionsModifiables()) {
             this.apply((XWikiDocument) mergeDocumentResult.getMergeResult());
         }
 
@@ -9399,8 +9383,29 @@ public DocumentAuthors getAuthors()
     }
 
     /**
-     * This getter has been created for hibernate in order to properly fill the DB field, it's not meant to be used
-     * for other purpose. For getting the displayed author, rely on {@link #getAuthors()}.
+     * Update the author of the document. It's the recommended way to update it if you don't fully understand the
+     * various types of authors exposed by {@link #getAuthor()}.
+     * <p>
+     * What will happen in practice is the following:
+     * <ul>
+     * <li>the effective and original metadata authors are set to the passed reference</li>
+     * <li>when saving the document, if the content is modified (the content dirty flag is true) then the content author
+     * will also be updated to the passed reference</li>
+     * </ul>
+     * 
+     * @param userReference the reference of the new author of the document
+     * @since 16.1.0RC1
+     */
+    @Unstable
+    public void setAuthor(UserReference userReference)
+    {
+        getAuthors().setEffectiveMetadataAuthor(userReference);
+        getAuthors().setOriginalMetadataAuthor(userReference);
+    }
+
+    /**
+     * This getter has been created for hibernate in order to properly fill the DB field, it's not meant to be used for
+     * other purpose. For getting the displayed author, rely on {@link #getAuthors()}.
      *
      * @return the serialization of the displayed author reference.
      */
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
index ec2ed1c2e341..990f6ab50d59 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/filter/output/DocumentInstanceOutputFilterStream.java
@@ -281,8 +281,7 @@ private void setAuthorReference(XWikiDocument document, DocumentReference author
     {
         // Document author
         UserReference authorUserReference = this.documentReferenceUserReferenceResolver.resolve(authorReference);
-        document.getAuthors().setEffectiveMetadataAuthor(authorUserReference);
-        document.getAuthors().setOriginalMetadataAuthor(authorUserReference);
+        document.setAuthor(authorUserReference);
 
         // Attachments author
         for (XWikiAttachment attachment : document.getAttachmentList()) {
@@ -299,8 +298,8 @@ private void setAuthors(XWikiDocument document, XWikiDocument inputDocument)
             documentAuthors.copyAuthors(inputDocumentAuthors);
         } else {
             documentAuthors.setEffectiveMetadataAuthor(inputDocumentAuthors.getEffectiveMetadataAuthor());
-            documentAuthors.setContentAuthor(inputDocumentAuthors.getContentAuthor());
             documentAuthors.setOriginalMetadataAuthor(inputDocumentAuthors.getOriginalMetadataAuthor());
+            documentAuthors.setContentAuthor(inputDocumentAuthors.getContentAuthor());
         }
 
         // Attachments author
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/EditAction.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/EditAction.java
index cedfe4624e78..7ee31e9d8617 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/EditAction.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/EditAction.java
@@ -148,8 +148,7 @@ protected XWikiDocument prepareEditedDocument(XWikiContext context) throws XWiki
         if (editedDocument.isMetaDataDirty()) {
             UserReference userReference =
                 this.documentReferenceUserReferenceResolver.resolve(context.getUserReference());
-            editedDocument.getAuthors().setEffectiveMetadataAuthor(userReference);
-            editedDocument.getAuthors().setOriginalMetadataAuthor(userReference);
+            editedDocument.setAuthor(userReference);
         }
 
         // If the content is modified, modify the content author
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java
index 2f8d0b71739f..4d1ad12e5eb6 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java
@@ -49,7 +49,6 @@
 import org.xwiki.configuration.ConfigurationSource;
 import org.xwiki.diff.ConflictDecision;
 import org.xwiki.job.Job;
-import org.xwiki.model.document.DocumentAuthors;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReference;
 import org.xwiki.refactoring.job.CreateRequest;
@@ -242,12 +241,10 @@ public boolean save(XWikiContext context) throws XWikiException
             Utils.getComponent(
                 new DefaultParameterizedType(null, UserReferenceResolver.class, DocumentReference.class), "document");
         UserReference userReference = userReferenceResolver.resolve(docUserReference);
-        DocumentAuthors authors = tdoc.getAuthors();
-        authors.setEffectiveMetadataAuthor(userReference);
-        authors.setOriginalMetadataAuthor(userReference);
+        tdoc.setAuthor(userReference);
 
         if (tdoc.isNew()) {
-            authors.setCreator(userReference);
+            tdoc.getAuthors().setCreator(userReference);
         }
 
         // Make sure we have at least the meta data dirty status
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java
index 298bd813d914..cd63aa3dca40 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java
@@ -192,8 +192,7 @@ void validSave() throws Exception
         assertFalse(saveAction.save(this.context));
         assertEquals(new Version("1.2"), this.context.get("SaveAction.savedObjectVersion"));
 
-        verify(this.mockAuthors).setOriginalMetadataAuthor(this.fooUserReference);
-        verify(this.mockAuthors).setEffectiveMetadataAuthor(this.fooUserReference);
+        verify(mockClonedDocument).setAuthor(this.fooUserReference);
         verify(mockClonedDocument).setMetaDataDirty(true);
         verify(this.xWiki).checkSavingDocument(USER_REFERENCE, mockClonedDocument, "My Changes", false, this.context);
         verify(this.xWiki).saveDocument(mockClonedDocument, "My Changes", false, this.context);
@@ -270,8 +269,7 @@ void validSaveRequestImageUploadAndConflictCheck() throws Exception
         assertFalse(saveAction.save(this.context));
         assertEquals(new Version("1.2"), this.context.get("SaveAction.savedObjectVersion"));
 
-        verify(this.mockAuthors).setOriginalMetadataAuthor(this.fooUserReference);
-        verify(this.mockAuthors).setEffectiveMetadataAuthor(this.fooUserReference);
+        verify(mockClonedDocument).setAuthor(this.fooUserReference);
         verify(mockClonedDocument).setMetaDataDirty(true);
         verify(this.xWiki).checkSavingDocument(USER_REFERENCE, mockClonedDocument, "My Changes", false, this.context);
         verify(this.xWiki).saveDocument(mockClonedDocument, "My Changes", false, this.context);

From e54f79175360671ab874092750e42740bb3328f2 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 30 Jan 2024 17:42:30 +0100
Subject: [PATCH 073/143] XWIKI-21812: Introduce a
 (XWiki)Document#setAuthor(AuthorReference) helper covering most use case of
 document author set * add test

---
 .../java/com/xpn/xwiki/doc/XWikiDocumentTest.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
index 7f3b6adee6b8..2925e70f332c 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
@@ -49,6 +49,7 @@
 import org.xwiki.test.junit5.LogCaptureExtension;
 import org.xwiki.test.junit5.mockito.InjectComponentManager;
 import org.xwiki.test.mockito.MockitoComponentManager;
+import org.xwiki.user.UserReference;
 import org.xwiki.velocity.VelocityEngine;
 import org.xwiki.velocity.VelocityManager;
 import org.xwiki.velocity.XWikiVelocityException;
@@ -909,4 +910,18 @@ void getDocumentArchiveAfterClone() throws XWikiException
         assertNotNull(cloneArchive);
         assertNotSame(cloneArchive, documentArchive);
     }
+
+    @Test
+    void setAuthor()
+    {
+        UserReference userReference = mock(UserReference.class);
+
+        this.document.setAuthor(userReference);
+
+        assertSame(userReference, this.document.getAuthors().getEffectiveMetadataAuthor());
+        assertSame(userReference, this.document.getAuthors().getOriginalMetadataAuthor());
+
+        assertNotSame(userReference, this.document.getAuthors().getContentAuthor());
+        assertNotSame(userReference, this.document.getAuthors().getCreator());
+    }
 }

From bcae1404567966656a9d601deb9ee3744861b889 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Tue, 30 Jan 2024 18:24:08 +0100
Subject: [PATCH 074/143] XWIKI-21837: Page Only Notification filters get
 deleted when a page is renamed/moved

  * Fix the listener that clean up filters to ignore rename events
  * Add a new integration test to check filters after a rename
---
 .../DeletedDocumentCleanUpFilterListener.java |  8 ++++--
 .../test/ui/NotificationsSettingsIT.java      | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/DeletedDocumentCleanUpFilterListener.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/DeletedDocumentCleanUpFilterListener.java
index cf6fe309f2a0..4b423753ea35 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/DeletedDocumentCleanUpFilterListener.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/DeletedDocumentCleanUpFilterListener.java
@@ -33,6 +33,7 @@
 import org.xwiki.observation.event.AbstractLocalEventListener;
 import org.xwiki.observation.event.BeginFoldEvent;
 import org.xwiki.observation.event.Event;
+import org.xwiki.refactoring.event.DocumentRenamingEvent;
 import org.xwiki.user.internal.group.UsersCache;
 
 /**
@@ -51,7 +52,8 @@ public class DeletedDocumentCleanUpFilterListener extends AbstractLocalEventList
 {
     static final String NAME = "org.xwiki.notifications.notifiers.internal.DeletedDocumentCleanUpFilterListener";
 
-    private static final BeginFoldEvent IGNORED_EVENTS = otherEvent -> otherEvent instanceof BeginFoldEvent;
+    private static final BeginFoldEvent FOLDED_EVENTS = otherEvent -> otherEvent instanceof BeginFoldEvent;
+    private static final DocumentRenamingEvent DOCUMENT_RENAMING_EVENT = new DocumentRenamingEvent();
 
     @Inject
     private ObservationContext observationContext;
@@ -73,7 +75,9 @@ public DeletedDocumentCleanUpFilterListener()
     @Override
     public void processLocalEvent(Event event, Object source, Object data)
     {
-        if (this.observationContext.isIn(IGNORED_EVENTS)) {
+        // Document rename usecase is handled with its own listener.
+        if (this.observationContext.isIn(FOLDED_EVENTS) && !this.observationContext.isIn(DOCUMENT_RENAMING_EVENT))
+        {
             DocumentDeletedEvent documentDeletedEvent = (DocumentDeletedEvent) event;
             DocumentReference documentReference = documentDeletedEvent.getDocumentReference();
             List<DocumentReference> users =
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
index c5f349d4e7cf..9b34be25e0d7 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
@@ -40,6 +40,9 @@
 import org.xwiki.test.docker.junit5.TestReference;
 import org.xwiki.test.docker.junit5.UITest;
 import org.xwiki.test.ui.TestUtils;
+import org.xwiki.test.ui.po.CopyOrRenameOrDeleteStatusPage;
+import org.xwiki.test.ui.po.RenamePage;
+import org.xwiki.test.ui.po.ViewPage;
 import org.xwiki.tree.test.po.TreeNodeElement;
 import org.xwiki.user.test.po.AbstractUserProfilePage;
 
@@ -718,4 +721,28 @@ void addCustomFilters(TestUtils testUtils)
         assertEquals(List.of("Alert"), filterPreference.getFormats());
         assertEquals(List.of("A page is modified", "A page is deleted"), filterPreference.getEventTypes());
     }
+
+    @Test
+    @Order(6)
+    void watchAndRename(TestUtils testUtils, TestReference testReference) throws Exception
+    {
+        testUtils.login(FIRST_USER_NAME, FIRST_USER_PASSWORD);
+        ViewPage viewPage = testUtils.createPage(testReference, "Content", "Title");
+        NotificationsTrayPage notificationsTrayPage = new NotificationsTrayPage();
+        notificationsTrayPage.showNotificationTray();
+        // Autowatch is enabled for created page
+        assertTrue(notificationsTrayPage.isPageOnlyWatched());
+        RenamePage renamePage = viewPage.rename();
+        renamePage.getDocumentPicker().setTitle(testReference.getName() + "Renamed");
+        CopyOrRenameOrDeleteStatusPage statusPage = renamePage.clickRenameButton().waitUntilFinished();
+        viewPage = statusPage.gotoNewPage();
+        notificationsTrayPage = new NotificationsTrayPage();
+        notificationsTrayPage.showNotificationTray();
+        assertTrue(notificationsTrayPage.isPageOnlyWatched());
+
+        viewPage = testUtils.gotoPage(testReference);;
+        notificationsTrayPage = new NotificationsTrayPage();
+        notificationsTrayPage.showNotificationTray();
+        assertFalse(notificationsTrayPage.isPageOnlyWatched());
+    }
 }

From 152fd6963adb5853054688d6a549f2a2186230d0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 24 Jan 2024 21:55:26 +0000
Subject: [PATCH 075/143] [Misc] Update npm to v10.4.0

---
 .../src/main/config/package-lock.json                           | 2 +-
 .../xwiki-platform-livedata-webjar/src/main/config/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index 75abea0e9533..f1619882dda6 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -37,7 +37,7 @@
       },
       "engines": {
         "node": "20.11.0",
-        "npm": "10.3.0"
+        "npm": "10.4.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index b7542da19b21..fab5bcb29977 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -9,7 +9,7 @@
     "test": "vue-cli-service test:unit"
   },
   "engines": {
-    "npm": "10.3.0",
+    "npm": "10.4.0",
     "node": "20.11.0"
   },
   "dependencies": {

From 5649ea4a0e98ce725067409bb0a6efc266b58a8a Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Wed, 31 Jan 2024 11:39:43 +0100
Subject: [PATCH 076/143] [Misc] Update npm to v10.4.0

Add missing maven part.
---
 .../xwiki-platform-livedata-webjar/pom.xml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
index 3e6d53b8a355..a8e406d7e2aa 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
@@ -168,7 +168,7 @@
             </goals>
             <configuration>
               <nodeVersion>v20.11.0</nodeVersion>
-              <npmVersion>10.3.0</npmVersion>
+              <npmVersion>10.4.0</npmVersion>
             </configuration>
           </execution>
           <execution>

From 34eeb657e633bf70c7536a205f24f66cee1c2cb9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 30 Jan 2024 12:35:39 +0000
Subject: [PATCH 077/143] [Misc] Update dependency eslint-plugin-vue to v9.21.0

---
 .../src/main/config/package-lock.json            | 16 ++++++++--------
 .../src/main/config/package.json                 |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index f1619882dda6..377c3af8fe7d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -28,7 +28,7 @@
         "@vue/vue2-jest": "29.2.6",
         "eslint": "8.56.0",
         "eslint-plugin-jest": "27.6.2",
-        "eslint-plugin-vue": "9.20.0",
+        "eslint-plugin-vue": "9.21.0",
         "flush-promises": "1.0.2",
         "jquery": "3.7.1",
         "less": "4.2.0",
@@ -9029,9 +9029,9 @@
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "9.20.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.20.0.tgz",
-      "integrity": "sha512-9/DV5CM7ItfgWmXjL6j3zyDtVTrslYdnEm+rnYNajdElx17b3erxi/Wc6FY7t3BQ6dgo0t/UBpgiWCOKtJyN8Q==",
+      "version": "9.21.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.21.0.tgz",
+      "integrity": "sha512-B3NgZRtbi9kSl7M0x/PqhSMk7ULJUwWxQpTvM8b2Z6gNTORK0YSt5v1vzwY84oMs/2+3BWH5XmTepaQebcJwfA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
@@ -9039,7 +9039,7 @@
         "nth-check": "^2.1.1",
         "postcss-selector-parser": "^6.0.13",
         "semver": "^7.5.4",
-        "vue-eslint-parser": "^9.4.0",
+        "vue-eslint-parser": "^9.4.2",
         "xml-name-validator": "^4.0.0"
       },
       "engines": {
@@ -18443,9 +18443,9 @@
       }
     },
     "node_modules/vue-eslint-parser": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.0.tgz",
-      "integrity": "sha512-7KsNBb6gHFA75BtneJsoK/dbZ281whUIwFYdQxA68QrCrGMXYzUMbPDHGcOQ0OocIVKrWSKWXZ4mL7tonCXoUw==",
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz",
+      "integrity": "sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.4",
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index fab5bcb29977..ab46b8718153 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -29,7 +29,7 @@
     "@vue/cli-plugin-unit-jest": "5.0.8",
     "@babel/eslint-parser": "7.23.3",
     "eslint": "8.56.0",
-    "eslint-plugin-vue": "9.20.0",
+    "eslint-plugin-vue": "9.21.0",
     "less": "4.2.0",
     "less-loader": "11.1.4",
     "vue-template-compiler": "2.7.16",

From 4cb1f9dde647646ca8efd592c2decc62ff373d3f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 12 Jan 2024 18:05:44 +0000
Subject: [PATCH 078/143] [Misc] Update dependency eslint-plugin-jest to
 v27.6.3

---
 .../src/main/config/package-lock.json                     | 8 ++++----
 .../src/main/config/package.json                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index 377c3af8fe7d..ad0e0679d584 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -27,7 +27,7 @@
         "@vue/test-utils": "1.3.6",
         "@vue/vue2-jest": "29.2.6",
         "eslint": "8.56.0",
-        "eslint-plugin-jest": "27.6.2",
+        "eslint-plugin-jest": "27.6.3",
         "eslint-plugin-vue": "9.21.0",
         "flush-promises": "1.0.2",
         "jquery": "3.7.1",
@@ -9004,9 +9004,9 @@
       }
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "27.6.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.2.tgz",
-      "integrity": "sha512-CI1AlKrsNhYFoP48VU8BVWOi7+qHTq4bRxyUlGjeU8SfFt8abjXhjOuDzUoMp68DoXIx17KpNpIkMrl4s4ZW0g==",
+      "version": "27.6.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.3.tgz",
+      "integrity": "sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^5.10.0"
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index ab46b8718153..6f59cc054a77 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -38,7 +38,7 @@
     "@testing-library/jest-dom": "5.17.0",
     "flush-promises": "1.0.2",
     "@vue/vue2-jest": "29.2.6",
-    "eslint-plugin-jest": "27.6.2"
+    "eslint-plugin-jest": "27.6.3"
   },
   "overrides": {
     "@vue/cli-plugin-unit-jest": {

From 41ff17d52a3adbba5ef7cd4290a8e5572a000662 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 25 Jan 2024 20:50:52 +0000
Subject: [PATCH 079/143] [Misc] Update dependency @babel/eslint-parser to
 v7.23.9

---
 .../src/main/config/package-lock.json                     | 8 ++++----
 .../src/main/config/package.json                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index ad0e0679d584..4e1e2e777f45 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -18,7 +18,7 @@
         "vuedraggable": "2.24.3"
       },
       "devDependencies": {
-        "@babel/eslint-parser": "7.23.3",
+        "@babel/eslint-parser": "7.23.9",
         "@testing-library/jest-dom": "5.17.0",
         "@vue/cli-plugin-babel": "5.0.8",
         "@vue/cli-plugin-eslint": "5.0.8",
@@ -135,9 +135,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz",
-      "integrity": "sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==",
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.9.tgz",
+      "integrity": "sha512-xPndlO7qxiJbn0ATvfXQBjCS7qApc9xmKHArgI/FTEFxXas5dnjC/VqM37lfZun9dclRYcn+YQAr6uDFy0bB2g==",
       "dev": true,
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index 6f59cc054a77..8448b7435790 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -27,7 +27,7 @@
     "@vue/cli-plugin-eslint": "5.0.8",
     "@vue/cli-service": "5.0.8",
     "@vue/cli-plugin-unit-jest": "5.0.8",
-    "@babel/eslint-parser": "7.23.3",
+    "@babel/eslint-parser": "7.23.9",
     "eslint": "8.56.0",
     "eslint-plugin-vue": "9.21.0",
     "less": "4.2.0",

From 3139f43f3dcde5b26b858a4db2eb910ac1bcffe9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 31 Jan 2024 12:27:43 +0000
Subject: [PATCH 080/143] [Misc] Update dependency @babel/eslint-parser to
 v7.23.10

---
 .../src/main/config/package-lock.json                     | 8 ++++----
 .../src/main/config/package.json                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index 4e1e2e777f45..3f2b43215d9a 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -18,7 +18,7 @@
         "vuedraggable": "2.24.3"
       },
       "devDependencies": {
-        "@babel/eslint-parser": "7.23.9",
+        "@babel/eslint-parser": "7.23.10",
         "@testing-library/jest-dom": "5.17.0",
         "@vue/cli-plugin-babel": "5.0.8",
         "@vue/cli-plugin-eslint": "5.0.8",
@@ -135,9 +135,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.9.tgz",
-      "integrity": "sha512-xPndlO7qxiJbn0ATvfXQBjCS7qApc9xmKHArgI/FTEFxXas5dnjC/VqM37lfZun9dclRYcn+YQAr6uDFy0bB2g==",
+      "version": "7.23.10",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz",
+      "integrity": "sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==",
       "dev": true,
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index 8448b7435790..d541c8c00e30 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -27,7 +27,7 @@
     "@vue/cli-plugin-eslint": "5.0.8",
     "@vue/cli-service": "5.0.8",
     "@vue/cli-plugin-unit-jest": "5.0.8",
-    "@babel/eslint-parser": "7.23.9",
+    "@babel/eslint-parser": "7.23.10",
     "eslint": "8.56.0",
     "eslint-plugin-vue": "9.21.0",
     "less": "4.2.0",

From e59eb58f8e639b38b9a35e1c1ccae76873616233 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 30 Jan 2024 16:04:05 +0000
Subject: [PATCH 081/143] [Misc] Update dependency less-loader to v12

---
 .../src/main/config/package-lock.json         | 19 ++++++++++++++-----
 .../src/main/config/package.json              |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
index 3f2b43215d9a..eccbbe4ed53d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json
@@ -32,7 +32,7 @@
         "flush-promises": "1.0.2",
         "jquery": "3.7.1",
         "less": "4.2.0",
-        "less-loader": "11.1.4",
+        "less-loader": "12.2.0",
         "vue-template-compiler": "2.7.16"
       },
       "engines": {
@@ -14334,20 +14334,29 @@
       }
     },
     "node_modules/less-loader": {
-      "version": "11.1.4",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.4.tgz",
-      "integrity": "sha512-6/GrYaB6QcW6Vj+/9ZPgKKs6G10YZai/l/eJ4SLwbzqNTBsAqt5hSLVF47TgsiBxV1P6eAU0GYRH3YRuQU9V3A==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz",
+      "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==",
       "dev": true,
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
         "less": "^3.5.0 || ^4.0.0",
         "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/less/node_modules/make-dir": {
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index d541c8c00e30..b425d9511217 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -31,7 +31,7 @@
     "eslint": "8.56.0",
     "eslint-plugin-vue": "9.21.0",
     "less": "4.2.0",
-    "less-loader": "11.1.4",
+    "less-loader": "12.2.0",
     "vue-template-compiler": "2.7.16",
     "@vue/test-utils": "1.3.6",
     "jquery": "3.7.1",

From cf7cd6cc61c69cd807030f44064beeac9921eca9 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Fri, 2 Feb 2024 09:51:28 +0100
Subject: [PATCH 082/143] XWIKI-21849: No link to next page at the bottom of
 LiveData (#2837)

---
 .../src/main/vue/LivedataBottombar.vue               | 12 +-----------
 .../src/main/vue/layouts/cards/LayoutCards.vue       |  1 +
 .../src/main/vue/layouts/table/LayoutTable.vue       |  1 +
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/LivedataBottombar.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/LivedataBottombar.vue
index 2fbbfefea12d..e651932d4cea 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/LivedataBottombar.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/LivedataBottombar.vue
@@ -36,14 +36,4 @@
 export default {
   name: "LivedataBottombar",
 };
-</script>
-
-
-<style>
-.livedata-bottombar {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
index 2b8cface93b9..ee1bda2e40cc 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/cards/LayoutCards.vue
@@ -76,6 +76,7 @@
       <div v-if="entriesFetched && entries.length === 0" class="noentries-card">
         {{ $t('livedata.bottombar.noEntries') }}
       </div>
+      <LivedataPagination/>
     </LivedataBottombar>
 
   </div>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
index 9af2dfaace4f..e6f9cc72ac24 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/table/LayoutTable.vue
@@ -90,6 +90,7 @@
       <div v-if="entriesFetched && entries.length === 0" class="noentries-table">
         {{ $t('livedata.bottombar.noEntries') }}
       </div>
+      <LivedataPagination/>
     </LivedataBottombar>
   </div>
 </template>

From af6b5abe06a8bfcfd6546e654ccf3931da31e6d9 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Fri, 2 Feb 2024 10:11:06 +0100
Subject: [PATCH 083/143] XWIKI-19041: Replace the Livetable from
 DocumentsMacro with a Live Data macro (#2775)

---
 .../xwiki/index/test/ui/docker/AllDocsIT.java | 136 ++++----
 .../org/xwiki/index/test/ui/docker/AllIT.java |  12 +
 .../test/ui/docker/DocumentsMacroIT.java      |  72 +++++
 .../xwiki/index/test/ui/docker}/SpacesIT.java |  43 ++-
 ...ocsLivetable.java => AllDocsLiveData.java} |  35 ++-
 .../org/xwiki/index/test/po/AllDocsPage.java  |  12 +-
 .../index/test/po/DocumentsMacroPage.java     |   8 +-
 .../xwiki/index/test/po/SpaceIndexPage.java   |   8 +-
 .../xwiki/index/test/ui/DocumentsMacroIT.java |  61 ----
 .../src/main/resources/Main/SpaceIndex.xml    |  69 +++-
 .../main/resources/XWiki/DocumentsMacro.xml   | 297 ++++++++++++++----
 .../livedata/test/po/TableLayoutElement.java  |  22 +-
 .../it/org/xwiki/mail/test/ui/MailIT.java     |   4 +-
 .../MailStatusAdministrationSectionPage.java  |  14 +-
 14 files changed, 549 insertions(+), 244 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/DocumentsMacroIT.java
 rename xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/{xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui => xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker}/SpacesIT.java (69%)
 rename xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/{AllDocsLivetable.java => AllDocsLiveData.java} (58%)
 delete mode 100644 xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/DocumentsMacroIT.java

diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllDocsIT.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllDocsIT.java
index 28ffc4f5a38d..e4b9c524492a 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllDocsIT.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllDocsIT.java
@@ -22,9 +22,10 @@
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
-import org.xwiki.index.test.po.AllDocsLivetable;
+import org.xwiki.index.test.po.AllDocsLiveData;
 import org.xwiki.index.test.po.AllDocsPage;
 import org.xwiki.livedata.test.po.TableLayoutElement;
 import org.xwiki.model.reference.DocumentReference;
@@ -52,7 +53,20 @@
 @UITest
 class AllDocsIT
 {
+    private static final String LOCATION_COLUMN_LABEL = "Location";
+
+    private static final String TYPE_COLUMN_LABEL = "Type";
+
+    private static final String NAME_COLUMN_LABEL = "Name";
+
+    private static final String SIZE_COLUMN_LABEL = "Size";
+
+    private static final String DATE_COLUMN_LABEL = "Date";
+
+    private static final String AUTHOR_COLUMN_LABEL = "Author";
+
     @Test
+    @Order(1)
     void verifyAllDocs(TestUtils setup, TestInfo testInfo, TestReference testReference)
     {
         // Fixture
@@ -62,7 +76,7 @@ void verifyAllDocs(TestUtils setup, TestInfo testInfo, TestReference testReferen
 
         // tests
         validateActionsAndGuest(setup);
-        validateFilterDoc(setup, testReference);
+        validateFilterDoc(testReference);
         validateCopyLink(setup, testInfo, testReference);
         validateRenameLink(setup, testInfo, testReference);
         validateDeleteLink(setup, testReference);
@@ -75,6 +89,7 @@ void verifyAllDocs(TestUtils setup, TestInfo testInfo, TestReference testReferen
      * This test is against XWiki Enterprise XE-701 https://jira.xwiki.org/browse/XE-701 (fixed in 2.5M1).
      */
     @Test
+    @Order(2)
     void attachmentsTabFilteringAndSorting(TestUtils setup, TestReference testReference) throws Exception
     {
         // Create 2 pages with attachments so that this test filter returns only one.
@@ -89,48 +104,48 @@ void attachmentsTabFilteringAndSorting(TestUtils setup, TestReference testRefere
         TableLayoutElement liveData = docsPage.clickAttachmentsTab().getTableLayout();
 
         // Here we test if all the Columns are displayed.
-        assertTrue(liveData.hasColumn("Type"), "No Type column found");
-        assertTrue(liveData.hasColumn("Name"), "No Name column found");
-        assertTrue(liveData.hasColumn("Location"), "No Location column found");
-        assertTrue(liveData.hasColumn("Size"), "No Size column found");
-        assertTrue(liveData.hasColumn("Date"), "No Date column found");
-        assertTrue(liveData.hasColumn("Author"), "No Author column found");
+        assertTrue(liveData.hasColumn(TYPE_COLUMN_LABEL), "No Type column found");
+        assertTrue(liveData.hasColumn(NAME_COLUMN_LABEL), "No Name column found");
+        assertTrue(liveData.hasColumn(LOCATION_COLUMN_LABEL), "No Location column found");
+        assertTrue(liveData.hasColumn(SIZE_COLUMN_LABEL), "No Size column found");
+        assertTrue(liveData.hasColumn(DATE_COLUMN_LABEL), "No Date column found");
+        assertTrue(liveData.hasColumn(AUTHOR_COLUMN_LABEL), "No Author column found");
 
         String defaultLocationFilter = className + ".";
 
-        liveData.filterColumn("Location", defaultLocationFilter);
+        liveData.filterColumn(LOCATION_COLUMN_LABEL, defaultLocationFilter);
 
         assertEquals(2, liveData.countRows());
 
         // Filter by attachment file name.
-        liveData.filterColumn("Name", "t1");
+        liveData.filterColumn(NAME_COLUMN_LABEL, "t1");
         assertEquals(1, liveData.countRows());
-        assertEquals("attachment1.txt", liveData.getCell("Name", 1).getText());
+        assertEquals("attachment1.txt", liveData.getCell(NAME_COLUMN_LABEL, 1).getText());
 
         // Clear the filter.
-        liveData.filterColumn("Name", "");
+        liveData.filterColumn(NAME_COLUMN_LABEL, "");
 
         // Filter by attachment location.
-        liveData.filterColumn("Location", defaultLocationFilter + "Oth");
+        liveData.filterColumn(LOCATION_COLUMN_LABEL, defaultLocationFilter + "Oth");
         assertEquals(1, liveData.countRows());
-        assertEquals(className + "OtherPage", liveData.getCell("Location", 1).getText());
+        assertEquals(className + "OtherPage", liveData.getCell(LOCATION_COLUMN_LABEL, 1).getText());
 
         // Reset the filter.
-        liveData.filterColumn("Location", defaultLocationFilter);
+        liveData.filterColumn(LOCATION_COLUMN_LABEL, defaultLocationFilter);
 
         // Sort by attachment file name. The live table should be already sorted by file name ascending. This will
         // reverse the order.
-        assertEquals("attachment2.txt", liveData.getCell("Name", 2).getText());
-        liveData.sortBy("Name");
+        assertEquals("attachment2.txt", liveData.getCell(NAME_COLUMN_LABEL, 2).getText());
+        liveData.sortBy(NAME_COLUMN_LABEL);
         assertEquals(2, liveData.countRows());
-        assertEquals("attachment2.txt", liveData.getCell("Name", 1).getText());
+        assertEquals("attachment2.txt", liveData.getCell(NAME_COLUMN_LABEL, 1).getText());
 
         // Sort by attachment location.
-        liveData.sortBy("Location");
-        assertEquals(className + "Page", liveData.getCell("Location", 2).getText());
-        liveData.sortBy("Location");
+        liveData.sortBy(LOCATION_COLUMN_LABEL);
+        assertEquals(className + "Page", liveData.getCell(LOCATION_COLUMN_LABEL, 2).getText());
+        liveData.sortBy(LOCATION_COLUMN_LABEL);
         assertEquals(2, liveData.countRows());
-        assertEquals(className + "Page", liveData.getCell("Location", 1).getText());
+        assertEquals(className + "Page", liveData.getCell(LOCATION_COLUMN_LABEL, 1).getText());
     }
 
     /**
@@ -141,15 +156,15 @@ private void validateActionsAndGuest(TestUtils setup)
         // Create a test user
         setup.createUserAndLogin("Foobar", "password");
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        assertTrue(livetable.hasColumn("Actions"), "No Actions column found");
+        AllDocsLiveData livetable = page.clickIndexTab();
+        assertTrue(livetable.getTableLayout().hasColumn("Actions"), "No Actions column found");
 
         // Logs out to be guest to verify that the Action columns is no longer displayed
         setup.forceGuestUser();
 
         page = AllDocsPage.gotoPage();
         livetable = page.clickIndexTab();
-        assertFalse(livetable.hasColumn("Actions"), "Actions column shouldn't be visible for guests");
+        assertFalse(livetable.getTableLayout().hasColumn("Actions"), "Actions column shouldn't be visible for guests");
 
         setup.loginAsSuperAdmin();
     }
@@ -157,19 +172,20 @@ private void validateActionsAndGuest(TestUtils setup)
     /**
      * Verify filtering works by filtering on the document name
      */
-    private void validateFilterDoc(TestUtils setup, TestReference testReference)
+    private void validateFilterDoc(TestReference testReference)
     {
         String testName = testReference.getLastSpaceReference().getName();
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
+        AllDocsLiveData livetable = page.clickIndexTab();
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
         // We get one result for the page we've created
-        assertEquals(1, livetable.getRowCount());
-        assertTrue(livetable.hasRow("Title", testName));
+        TableLayoutElement tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        tableLayout.assertRow("Title", testName);
 
         // We get no result for a page created by user barbaz
-        livetable.filterColumn(4, "barbaz");
-        assertEquals(0, livetable.getRowCount());
+        livetable.filterColumn("Last Author", "barbaz");
+        assertEquals(0, tableLayout.countRows());
     }
 
     /**
@@ -185,11 +201,12 @@ private void validateCopyLink(TestUtils setup, TestInfo testInfo, TestReference
         setup.deletePage(copyPageReference);
 
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
+        AllDocsLiveData livetable = page.clickIndexTab();
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
         // We get one result for the page we've created
-        assertEquals(1, livetable.getRowCount());
-        assertTrue(livetable.hasRow("Title", testName));
+        TableLayoutElement tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        tableLayout.assertRow("Title", testName);
 
         // click on the copy action link.
         livetable.clickAction(1, "copy");
@@ -202,10 +219,11 @@ private void validateCopyLink(TestUtils setup, TestInfo testInfo, TestReference
 
         page = AllDocsPage.gotoPage();
         livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
-        assertEquals(2, livetable.getRowCount());
-        livetable.filterColumn(2, copyPageName);
-        assertEquals(1, livetable.getRowCount());
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
+        tableLayout = livetable.getTableLayout();
+        assertEquals(2, tableLayout.countRows());
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, copyPageName);
+        assertEquals(1, tableLayout.countRows());
 
         setup.deletePage(copyPageReference);
     }
@@ -219,11 +237,12 @@ private void validateRenameLink(TestUtils setup, TestInfo testInfo, TestReferenc
             Arrays.asList(testSpace, renamedPageName), "WebHome");
 
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
+        AllDocsLiveData livetable = page.clickIndexTab();
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
         // We get one result for the page we've created
-        assertEquals(1, livetable.getRowCount());
-        assertTrue(livetable.hasRow("Title", testName));
+        TableLayoutElement tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        tableLayout.assertRow("Title", testName);
 
         // click on the copy action link.
         livetable.clickAction(1, "rename");
@@ -236,9 +255,10 @@ private void validateRenameLink(TestUtils setup, TestInfo testInfo, TestReferenc
 
         page = AllDocsPage.gotoPage();
         livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
-        assertEquals(1, livetable.getRowCount());
-        assertEquals(testSpace + renamedPageName, livetable.getCell(1, 2).getText());
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
+        tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        assertEquals(testSpace + renamedPageName, tableLayout.getCell(LOCATION_COLUMN_LABEL, 1).getText());
 
         setup.deletePage(renamedPageReference);
         setup.createPage(testReference, "", testReference.getLastSpaceReference().getName());
@@ -249,11 +269,12 @@ private void validateDeleteLink(TestUtils setup, TestReference testReference)
         String testName = testReference.getLastSpaceReference().getName();
 
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
+        AllDocsLiveData livetable = page.clickIndexTab();
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
         // We get one result for the page we've created
-        assertEquals(1, livetable.getRowCount());
-        assertTrue(livetable.hasRow("Title", testName));
+        TableLayoutElement tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        tableLayout.assertRow("Title", testName);
 
         // click on the copy action link.
         livetable.clickAction(1, "delete");
@@ -262,8 +283,8 @@ private void validateDeleteLink(TestUtils setup, TestReference testReference)
         deletingPage.waitUntilFinished();
         page = AllDocsPage.gotoPage();
         livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
-        assertEquals(0, livetable.getRowCount());
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
+        assertEquals(0, livetable.getTableLayout().countRows());
         setup.createPage(testReference, "", testReference.getLastSpaceReference().getName());
     }
 
@@ -272,11 +293,12 @@ private void validateRightLink(TestUtils setup, TestReference testReference)
         String testName = testReference.getLastSpaceReference().getName();
 
         AllDocsPage page = AllDocsPage.gotoPage();
-        AllDocsLivetable livetable = page.clickIndexTab();
-        livetable.filterColumn(2, testName);
+        AllDocsLiveData livetable = page.clickIndexTab();
+        livetable.filterColumn(LOCATION_COLUMN_LABEL, testName);
         // We get one result for the page we've created
-        assertEquals(1, livetable.getRowCount());
-        assertTrue(livetable.hasRow("Title", testName));
+        TableLayoutElement tableLayout = livetable.getTableLayout();
+        assertEquals(1, tableLayout.countRows());
+        tableLayout.assertRow("Title", testName);
 
         // click on the copy action link.
         livetable.clickAction(1, "rights");
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java
index 16242b269c0c..202cde366e9c 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java
@@ -49,4 +49,16 @@ class NestedDeletedAttachmentsIT extends DeletedAttachmentsIT
     class NestedOrphanedPagesIT extends OrphanedPagesIT
     {
     }
+
+    @Nested
+    @DisplayName("Documents Macro UI")
+    class NestedDocumentsMacroIT extends DocumentsMacroIT
+    {
+    }
+
+    @Nested
+    @DisplayName("Spaces UI")
+    class NestedSpacesIT extends SpacesIT
+    {
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/DocumentsMacroIT.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/DocumentsMacroIT.java
new file mode 100644
index 000000000000..576edadbd82b
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/DocumentsMacroIT.java
@@ -0,0 +1,72 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.index.test.ui.docker;
+
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.xwiki.index.test.po.DocumentsMacroPage;
+import org.xwiki.livedata.test.po.TableLayoutElement;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.model.reference.SpaceReference;
+import org.xwiki.test.docker.junit5.TestReference;
+import org.xwiki.test.docker.junit5.UITest;
+import org.xwiki.test.ui.TestUtils;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests for the DocumentsMacro page.
+ *
+ * @version $Id$
+ * @since 4.2M3
+ */
+@UITest
+class DocumentsMacroIT
+{
+    /**
+     * Verify that the {@code {{documents/}}} macro works by going to the page defining this wiki macro since it
+     * contains an example usage and we can verify it displays the expected result.
+     */
+    @Test
+    @Order(1)
+    void documentsMacro(TestUtils setup, TestReference testReference)
+    {
+        // Create a dummy page in the Main space and having Main.WebHome as its parent so that it appears in the
+        // Documents Macro livetable (since the example lists pages in the Main space having Main.WebHome as their
+        // parent).
+        String testMethodName = testReference.getLastSpaceReference().getName();
+        DocumentReference documentReference = new DocumentReference(testMethodName,
+            new SpaceReference("Main", testReference.getWikiReference()));
+        setup.createPage(documentReference, "", "Test Title", "xwiki/2.1", "Main.WebHome");
+
+        DocumentsMacroPage dmp = DocumentsMacroPage.gotoPage();
+        TableLayoutElement tableLayout = dmp.getDocumentsExampleLiveTable().getTableLayout();
+
+        // Verify that we have a Page column
+        assertTrue(tableLayout.hasColumn("Title"), "No Title column found");
+
+        // Verify there are several rows displayed
+        assertTrue(tableLayout.countRows() > 0);
+
+        // Verify that page titles are displayed by filtering on one page for which we know the title
+        tableLayout.filterColumn("Location", testMethodName);
+        tableLayout.assertRow("Title", "Test Title");
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/SpacesIT.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/SpacesIT.java
similarity index 69%
rename from xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/SpacesIT.java
rename to xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/SpacesIT.java
index 2526dc46996b..c6848474d685 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/SpacesIT.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/SpacesIT.java
@@ -17,20 +17,20 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.xwiki.index.test.ui;
+package org.xwiki.index.test.ui.docker;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
 import org.xwiki.index.test.po.SpaceIndexPage;
 import org.xwiki.index.test.po.SpacesMacroPage;
-import org.xwiki.test.ui.AbstractTest;
-import org.xwiki.test.ui.browser.IgnoreBrowser;
-import org.xwiki.test.ui.browser.IgnoreBrowsers;
-import org.xwiki.test.ui.po.LiveTableElement;
+import org.xwiki.livedata.test.po.LiveDataElement;
+import org.xwiki.test.docker.junit5.TestReference;
+import org.xwiki.test.docker.junit5.UITest;
+import org.xwiki.test.ui.TestUtils;
 import org.xwiki.test.ui.po.ViewPage;
 import org.xwiki.test.ui.po.editor.WikiEditPage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests the Spaces Macro.
@@ -38,22 +38,20 @@
  * @version $Id$
  * @since 7.0RC1
  */
-public class SpacesIT extends AbstractTest
+@UITest
+class SpacesIT
 {
     @Test
-    @IgnoreBrowsers({
-    @IgnoreBrowser(value = "internet.*", version = "8\\.*", reason="See https://jira.xwiki.org/browse/XE-1146"),
-    @IgnoreBrowser(value = "internet.*", version = "9\\.*", reason="See https://jira.xwiki.org/browse/XE-1177")
-    })
-    public void spacesMacro()
+    @Order(1)
+    void spacesMacro(TestUtils setup, TestReference testReference)
     {
         // Create a page with special characters in space name
         // See XE-1228: Broken links displayed in the Spaces widget if a space name contains a colon
         // See XE-1298: Spaces macro doesn't list spaces that contain a colon in their name
-        String spaceName = getTestClassName() + ":" + getTestMethodName() + "&";
-        String referenceEscapedSpaceName = getTestClassName() + "\\:" + getTestMethodName() + "&";
+        String spaceName = setup.serializeReference(testReference.getLastSpaceReference()) + "&";
+        String referenceEscapedSpaceName = spaceName.replaceAll("\\.", "\\\\.").replaceAll(":", "\\\\:");
         // Make sure the new space's WebHome page doesn't exist.
-        getUtil().deletePage(spaceName, "WebHome");
+        setup.deletePage(spaceName, "WebHome");
 
         // Create the new space using the UI and verify it leads to the space home page being edited.
         SpacesMacroPage macroPage = SpacesMacroPage.gotoPage();
@@ -63,7 +61,7 @@ public void spacesMacro()
         // Verify that space creation uses the space name as the space home page's title
         assertEquals(spaceName, editPage.getDocumentTitle());
 
-        // Verify that the space created is correct by looking at the generate metadata in the HTML header
+        // Verify that the space created is correct by looking at the generated metadata in the HTML header
         // (they contain the space reference amongst other data).
         // Note: the value will be escaped since it is the space reference, not the space name.
         assertEquals(referenceEscapedSpaceName, editPage.getMetaDataValue("space"));
@@ -76,11 +74,10 @@ public void spacesMacro()
         macroPage.getSpacesMacroPane().clickSpaceIndex(referenceEscapedSpaceName);
 
         // Assert the content of the space index live table.
-        LiveTableElement spaceIndexLiveTable = new SpaceIndexPage().getLiveTable();
-        spaceIndexLiveTable.waitUntilReady();
-        assertEquals(1, spaceIndexLiveTable.getRowCount());
-        assertTrue(spaceIndexLiveTable.hasRow("Page", "WebHome"));
-        assertTrue(spaceIndexLiveTable.hasRow("Space", referenceEscapedSpaceName));
+        LiveDataElement spaceIndexLiveTable = new SpaceIndexPage().getLiveData();
+        assertEquals(1, spaceIndexLiveTable.getTableLayout().countRows());
+        spaceIndexLiveTable.getTableLayout().assertRow("Page", "WebHome");
+        spaceIndexLiveTable.getTableLayout().assertRow("Space", referenceEscapedSpaceName);
 
         // Go back to the Spaces Macro page and this time verify that the link to the space home page works
         macroPage = SpacesMacroPage.gotoPage();
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLivetable.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLiveData.java
similarity index 58%
rename from xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLivetable.java
rename to xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLiveData.java
index 96bcde884696..317c57af6851 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLivetable.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsLiveData.java
@@ -19,34 +19,45 @@
  */
 package org.xwiki.index.test.po;
 
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-import org.xwiki.test.ui.po.LiveTableElement;
+import org.xwiki.livedata.test.po.LiveDataElement;
 
 /**
  * Represents the livetable for index all docs.
  *
+ * @version $Id$
  * @since 11.6RC1
  * @since 11.5
- * @version $Id$
  */
-public class AllDocsLivetable extends LiveTableElement
+public class AllDocsLiveData extends LiveDataElement
 {
-    public AllDocsLivetable()
+    /**
+     * Default constructor.
+     */
+    public AllDocsLiveData()
     {
         super("alldocs");
     }
 
-    public void filterColumn(int columnNumber, String filterValue)
+    /**
+     * Filter a column using the provided value.
+     *
+     * @param columnLabel the label of the column to filter
+     * @param filterValue the value to use to filter
+     */
+    public void filterColumn(String columnLabel, String filterValue)
     {
-        String columnId = String.format("xwiki-livetable-alldocs-filter-%s", columnNumber);
-        this.filterColumn(columnId, filterValue);
+        // TODO: replace column number with the column label.
+        getTableLayout().filterColumn(columnLabel, filterValue);
     }
 
+    /**
+     * Click on a Live Data action.
+     *
+     * @param rowNumber the number of the row of the action (start at 1 for the first row)
+     * @param actionName the name of the action to click (e.g., 'copy')
+     */
     public void clickAction(int rowNumber, String actionName)
     {
-        WebElement pageRow = this.getRow(rowNumber);
-        String xPathLocator = String.format("//a[contains(@class, 'action%s')]", actionName);
-        pageRow.findElement(By.xpath(xPathLocator)).click();
+        getTableLayout().clickAction(rowNumber, actionName);
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsPage.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsPage.java
index 4b97aec25c22..d8b3559fbb21 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsPage.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/AllDocsPage.java
@@ -64,14 +64,16 @@ public static String getURL()
         return getUtil().getURL("Main", "AllDocs");
     }
 
-    public AllDocsLivetable clickIndexTab()
+    /**
+     * Click on the index tab.
+     *
+     * @return the Live Data listing all the documents
+     */
+    public AllDocsLiveData clickIndexTab()
     {
         this.indexTab.click();
 
-        AllDocsLivetable lt = new AllDocsLivetable();
-        lt.waitUntilReady();
-
-        return lt;
+        return new AllDocsLiveData();
     }
 
     public DocumentTreeElement clickTreeTab()
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/DocumentsMacroPage.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/DocumentsMacroPage.java
index 5a6e9c6dc635..d884bb71c212 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/DocumentsMacroPage.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/DocumentsMacroPage.java
@@ -19,7 +19,7 @@
  */
 package org.xwiki.index.test.po;
 
-import org.xwiki.test.ui.po.LiveTableElement;
+import org.xwiki.livedata.test.po.LiveDataElement;
 import org.xwiki.test.ui.po.ViewPage;
 
 /**
@@ -36,10 +36,8 @@ public static DocumentsMacroPage gotoPage()
         return new DocumentsMacroPage();
     }
 
-    public LiveTableElement getDocumentsExampleLiveTable()
+    public LiveDataElement getDocumentsExampleLiveTable()
     {
-        LiveTableElement lt = new LiveTableElement("example");
-        lt.waitUntilReady();
-        return lt;
+        return new LiveDataElement("example");
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/SpaceIndexPage.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/SpaceIndexPage.java
index db3627fd0a3c..006e8706a9da 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/SpaceIndexPage.java
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/src/main/java/org/xwiki/index/test/po/SpaceIndexPage.java
@@ -21,7 +21,7 @@
 
 import java.util.Collections;
 
-import org.xwiki.test.ui.po.LiveTableElement;
+import org.xwiki.livedata.test.po.LiveDataElement;
 import org.xwiki.test.ui.po.ViewPage;
 
 /**
@@ -35,7 +35,7 @@ public class SpaceIndexPage extends ViewPage
     /**
      * The live table that lists the documents from the space.
      */
-    private LiveTableElement liveTable = new LiveTableElement("spaceindex");
+    private final LiveDataElement liveDataElement = new LiveDataElement("spaceindex");
 
     /**
      * Opens the document index for the specified page.
@@ -52,8 +52,8 @@ public static SpaceIndexPage gotoPage(String spaceName)
     /**
      * @return the document index live table
      */
-    public LiveTableElement getLiveTable()
+    public LiveDataElement getLiveData()
     {
-        return liveTable;
+        return this.liveDataElement;
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/DocumentsMacroIT.java b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/DocumentsMacroIT.java
deleted file mode 100644
index 72648faf1637..000000000000
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/src/test/it/org/xwiki/index/test/ui/DocumentsMacroIT.java
+++ /dev/null
@@ -1,61 +0,0 @@
- /*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.index.test.ui;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.xwiki.index.test.po.DocumentsMacroPage;
-import org.xwiki.test.ui.AbstractGuestTest;
-import org.xwiki.test.ui.po.LiveTableElement;
-
- /**
-  * Tests for the DocumentsMacro page.
-  *
-  * @version $Id$
-  * @since 4.2M3
-  */
- public class DocumentsMacroIT extends AbstractGuestTest
- {
-     /**
-      * Verify that the {{documents}} macro works by going to the page defining this wiki macro since it contains
-      * an example usage and we can verify it displays the expected result.
-      */
-     @Test
-     public void testDocumentsMacro() throws Exception
-     {
-         // Create a dummy page in the Main space and having Main.WebHome as its parent so that it appears in the
-         // Documents Macro livetable (since the example lists pages in the Main space having Main.WebHome as their
-         // parent).
-         getUtil().createPage("Main", getTestMethodName(), "", "Test Title", "xwiki/2.1", "Main.WebHome");
-
-         DocumentsMacroPage dmp = DocumentsMacroPage.gotoPage();
-         LiveTableElement livetable = dmp.getDocumentsExampleLiveTable();
-
-         // Verify that we have a Page column
-         Assert.assertTrue("No Title column found", livetable.hasColumn("Title"));
-
-         // Verify there are several rows displayed
-         Assert.assertTrue(livetable.getRowCount() > 0);
-
-         // Verify that page titles are displayed by filtering on one page for which we know the title
-         livetable.filterColumn("xwiki-livetable-example-filter-2", getTestMethodName());
-         Assert.assertTrue(livetable.hasRow("Title", "Test Title"));
-     }
- }
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/Main/SpaceIndex.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/Main/SpaceIndex.xml
index 167b0e0cecc4..88792c5c4ed6 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/Main/SpaceIndex.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/Main/SpaceIndex.xml
@@ -37,12 +37,22 @@
   <syntaxId>xwiki/2.0</syntaxId>
   <hidden>true</hidden>
   <content>{{velocity}}
-#if("$!request.space" != "") #set($space=$request.space) #else #set($space = $doc.space) #end
-$services.localization.render('platform.index.spaceIndexDescription', [$space])
+#if("$!request.space" != "")
+  #set($space=$request.space)
+#else
+  #set($space = $doc.space)
+#end
 ## Since we display the space index, we do not display page titles and locations, but the old columns name and space 
 ## (old behavior consistent with this old macro)...
 
-{{documents space="$space.replaceAll('["~]', '~$0')" id="spaceindex" columns="doc.name, doc.space, doc.date, doc.author"/}}
+#set ($description = $services.localization.render('platform.index.spaceIndexDescription', [$space]))
+#set ($description = $services.rendering.escape($description, 'xwiki/2.1'))
+{{documents
+  space="$services.rendering.escape($space, 'xwiki/2.1')"
+  id="spaceindex"
+  columns="doc.name,doc.space,doc.date,doc.author"
+  description="$description"
+/}}
 #set($docextras=[])
 {{/velocity}}
 </content>
@@ -86,7 +96,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <separators>|, </separators>
         <size>5</size>
         <unmodifiable>0</unmodifiable>
-        <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -106,6 +116,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>code</name>
         <number>10</number>
         <prettyName>Macro code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -118,6 +129,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>contentDescription</name>
         <number>9</number>
         <prettyName>Content description (Not applicable for "No content" type)</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -186,6 +198,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>description</name>
         <number>3</number>
         <prettyName>Macro description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -377,6 +390,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -402,13 +416,24 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -455,6 +480,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -480,13 +506,24 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -533,6 +570,7 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -558,13 +596,24 @@ $services.localization.render('platform.index.spaceIndexDescription', [$space])
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
index 0f5a6ce0e56b..ef9e0c544e52 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
@@ -83,7 +83,7 @@ Generates:
         <separators>|, </separators>
         <size>5</size>
         <unmodifiable>0</unmodifiable>
-        <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -103,6 +103,7 @@ Generates:
         <name>code</name>
         <number>10</number>
         <prettyName>Macro code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -115,6 +116,7 @@ Generates:
         <name>contentDescription</name>
         <number>9</number>
         <prettyName>Content description (Not applicable for "No content" type)</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -183,6 +185,7 @@ Generates:
         <name>description</name>
         <number>3</number>
         <prettyName>Macro description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -256,65 +259,63 @@ Generates:
     </property>
     <property>
       <code>{{velocity}}
-#if ("$!xcontext.macro.params.columns" != "") 
-  #set ($collist = [])
+#if ("$!xcontext.macro.params.columns" != "")
+  #set ($properties = [])
   #foreach ($colname in $xcontext.macro.params.columns.split(','))
-    #set ($discard = $collist.add($colname.trim()))
+    #set ($discard = $properties.add($colname.trim()))
   #end
 #else
-  #set($collist = ['doc.title', 'doc.location', 'doc.date', 'doc.author'])
+  #set ($properties = ['doc.title', 'doc.location', 'doc.date', 'doc.author'])
 #end
-#set($colprops = {
-  'doc.title' : { 'size' : 30, 'link' : 'view' },
-  'doc.location' : { 'html': true },
-  'doc.fullName' : { 'size' : 30, 'link' : 'view' },
-  'doc.name' : { 'size' : 30, 'link' : 'view' },
-  'doc.space' : { 'link' : 'space' },
-  'doc.author' : { 'link' : 'author' }
+#set ($sourceParameters = {
+  'translationPrefix' : 'platform.index.'
 })
-#set($options = { 
-  'translationPrefix' : 'platform.index.',
-  'rowCount' : $xcontext.macro.params.count,
-  'description' : 'This table lists documents found on this wiki based on passed criteria. The columns can be sorted and some can be filtered.'
-})
-#if ("$!xcontext.macro.params.space" != "") 
-  #set ($extraParams = "&amp;space=$escapetool.url($xcontext.macro.params.space)")
-#end
-#if ("$!xcontext.macro.params.location" != "") 
-  #set ($extraParams = "$!{extraParams}&amp;location=$escapetool.url($xcontext.macro.params.location)")
-#end
-#if ("$!xcontext.macro.params.parent" != "") 
-  #set ($extraParams = "$!{extraParams}&amp;parent=$escapetool.url($xcontext.macro.params.parent)")
+#if ("$!xcontext.macro.params.space" != "")
+  #set ($discard = $sourceParameters.put('space', $xcontext.macro.params.space))
 #end
-#if ("$!extraParams" != "")
-  #set($discard = $options.put('extraParams', $extraParams))
+#if ("$!xcontext.macro.params.location" != "")
+  #set ($discard = $sourceParameters.put('location', $xcontext.macro.params.location))
 #end
-#if(!$isGuest &amp;&amp; $xcontext.macro.params.actions == "true")
-  #set($discard = $collist.add('_actions'))
-  #set($discard = $colprops.put('_actions', {
-    'actions': ['copy', 'rename', 'rights', 'delete'],
-    'filterable': false,
-    'sortable': false
-  }))
+#if ("$!xcontext.macro.params.parent" != "")
+  #set ($discard = $sourceParameters.put('parent', $xcontext.macro.params.parent))
 #end
+#set ($propertyDescriptors = [])
 #if ("$!services.like" != "")
-  #set($discard = $collist.add('_likes'))
   ## We can't make it sortable or filterable right now since it's not stored in DB.
-  #set($discard = $colprops.put('_likes', {
-    'filterable': false,
-    'sortable': false
-  }))
+  #set ($discard = $propertyDescriptors.add({ 'id': '_likes', 'sortable': false, 'filterable': false }))
+  #set ($discard = $properties.add('_likes'))
 #end
-#if ($collist.contains('doc.location'))
-  #set ($discard = $options.put('selectedColumn','doc.location'))
+#if(!$isGuest &amp;&amp; $xcontext.macro.params.actions == "true")
+  #set ($discard = $propertyDescriptors.add({ 'id': '_actions', 'displayer': { 'id': 'actions', 'actions': ['copy', 'rename', 'rights', 'delete'] }}))
+  #set ($discard = $properties.add('_actions'))
 #end
+#set ($liveDataConfig = {'meta': {'propertyDescriptors': $propertyDescriptors}})
 #if ("$!xcontext.macro.params.id" != "")
-  #set ($livetableId = $xcontext.macro.params.id)
+  #set ($livedataId = $xcontext.macro.params.id)
 #else
   ## TODO: Improve this since we could have several livetables on the same page with same ids
-  #set ($livetableId = "documents-$mathtool.random(1, 1000)")
+  #set ($livedataId = "documents-$mathtool.random(1, 1000)")
+#end
+
+#set ($livedataId = $services.rendering.escape($livedataId, 'xwiki/2.1'))
+#set ($description = '')
+#if ("$!xcontext.macro.params.description" != '')
+  #set ($description = $services.rendering.escape($xcontext.macro.params.description, 'xwiki/2.1'))
+#end
+#set ($limit = '')
+#if ("$!xcontext.macro.params.count" != '')
+  #set ($limit = $services.rendering.escape($xcontext.macro.params.count, 'xwiki/2.1'))
 #end
-#livetable($livetableId $collist $colprops $options)
+#set ($properties = $services.rendering.escape($stringtool.join($properties, ','), 'xwiki/2.1'))
+{{liveData
+  id="$livedataId"
+  properties="$properties"
+  source="liveTable"
+  sourceParameters="$escapetool.url($sourceParameters)"
+  #if ($description != '')description="$description"#end
+  #if ($properties.contains('doc.location'))sort="doc.location"#end
+  #if ($limit != '')limit="$limit"#end
+}}$jsontool.serialize($liveDataConfig){{/liveData}}
 {{/velocity}}</code>
     </property>
     <property>
@@ -332,7 +333,7 @@ Generates:
       </defaultCategories>
     </property>
     <property>
-      <description>Displays a list of documents in a Livetable</description>
+      <description>Displays a list of documents in a Live Data</description>
     </property>
     <property>
       <id>documents</id>
@@ -378,6 +379,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -403,13 +405,24 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -456,6 +469,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -481,13 +495,24 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -534,6 +559,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -559,13 +585,24 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -612,6 +649,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -637,20 +675,31 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
       <defaultValue/>
     </property>
     <property>
-      <description>Livetable id</description>
+      <description>Live Data id</description>
     </property>
     <property>
       <mandatory>0</mandatory>
@@ -690,6 +739,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -715,13 +765,24 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -768,6 +829,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -793,20 +855,31 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
       <defaultValue/>
     </property>
     <property>
-      <description>Specifies the list of columns to display (e.g. "doc.name,doc.space"). If not specified then the default column list of used ("doc.name,doc.space,doc.date,doc.author")</description>
+      <description>Specifies the list of properties (e.g., "doc.name,doc.space"). If not specified then the default properties list is used ("doc.name,doc.space,doc.date,doc.author")</description>
     </property>
     <property>
       <mandatory>0</mandatory>
@@ -846,6 +919,7 @@ Generates:
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -871,13 +945,24 @@ Generates:
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -896,4 +981,94 @@ Generates:
       <type/>
     </property>
   </object>
+  <object>
+    <name>XWiki.DocumentsMacro</name>
+    <number>7</number>
+    <className>XWiki.WikiMacroParameterClass</className>
+    <guid>216587c3-ad5c-45aa-a379-3e016dc72268</guid>
+    <class>
+      <name>XWiki.WikiMacroParameterClass</name>
+      <customClass/>
+      <customMapping/>
+      <defaultViewSheet/>
+      <defaultEditSheet/>
+      <defaultWeb/>
+      <nameField/>
+      <validationScript/>
+      <defaultValue>
+        <disabled>0</disabled>
+        <name>defaultValue</name>
+        <number>4</number>
+        <prettyName>Parameter default value</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </defaultValue>
+      <description>
+        <disabled>0</disabled>
+        <name>description</name>
+        <number>2</number>
+        <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
+        <rows>5</rows>
+        <size>40</size>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+      </description>
+      <mandatory>
+        <disabled>0</disabled>
+        <displayFormType>select</displayFormType>
+        <displayType>yesno</displayType>
+        <name>mandatory</name>
+        <number>3</number>
+        <prettyName>Parameter mandatory</prettyName>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+      </mandatory>
+      <name>
+        <disabled>0</disabled>
+        <name>name</name>
+        <number>1</number>
+        <prettyName>Parameter name</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </name>
+      <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
+        <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
+        <name>type</name>
+        <number>5</number>
+        <picker>1</picker>
+        <prettyName>Parameter type</prettyName>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
+        <unmodifiable>0</unmodifiable>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+      </type>
+    </class>
+    <property>
+      <defaultValue/>
+    </property>
+    <property>
+      <description>Provide a description of the list of documents</description>
+    </property>
+    <property>
+      <mandatory>0</mandatory>
+    </property>
+    <property>
+      <name>description</name>
+    </property>
+    <property>
+      <type/>
+    </property>
+  </object>
 </xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
index f86fcd2b23b5..40a2823f4c85 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
@@ -688,8 +688,19 @@ public Set<String> getPaginationSizes()
      */
     public void clickAction(int rowNumber, String actionName)
     {
-        getRoot().findElement(By.cssSelector(
-            String.format("tbody tr:nth-child(%d) [name='%s']", rowNumber, actionName)))
+        clickAction(rowNumber, By.cssSelector(String.format(".actions-container .action.action_%s", actionName)));
+    }
+
+    /**
+     * Clicks on an action based on a row and the provided selector.
+     *
+     * @param rowNumber the row number, for instance 3 for the third row
+     * @param selector the selector to find the action element in the row
+     */
+    public void clickAction(int rowNumber, By selector)
+    {
+        getRowElement(rowNumber)
+            .findElement(selector)
             .click();
     }
 
@@ -732,10 +743,15 @@ public void editAndCancel(String columnLabel, int rowNumber, String fieldName, S
      */
     public WebElement findElementInRow(int rowNumber, By by)
     {
-        return getRoot().findElement(By.cssSelector(String.format("tbody tr:nth-child(%d)", rowNumber)))
+        return getRowElement(rowNumber)
             .findElement(by);
     }
 
+    private WebElement getRowElement(int rowNumber)
+    {
+        return getRoot().findElement(By.cssSelector(String.format("tbody tr:nth-child(%d)", rowNumber)));
+    }
+
     /**
      * Return a hamcrest {@link Matcher} on the text of a {@link WebElement}. For instance the {@link Matcher} will
      * match on the web element containing the following html source {@code <p>Te<i>st</i></p>} for the value {@code
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/src/test/it/org/xwiki/mail/test/ui/MailIT.java b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/src/test/it/org/xwiki/mail/test/ui/MailIT.java
index 5837853fdff0..ebb6ef4d6e3f 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/src/test/it/org/xwiki/mail/test/ui/MailIT.java
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/src/test/it/org/xwiki/mail/test/ui/MailIT.java
@@ -264,7 +264,7 @@ private void verifyMailDelete()
         TableLayoutElement tableLayout = statusPage.getLiveData().getTableLayout();
         tableLayout.filterColumn("Status", "send_success");
         int count = tableLayout.countRows();
-        tableLayout.clickAction(1, "mailsendingaction_delete");
+        statusPage.clickAction(1, "mailsendingaction_delete");
 
         // Wait for the success message to be displayed
         statusPage.waitUntilContent("\\QThe mail has been deleted successfully\\E");
@@ -279,7 +279,7 @@ private void verifyIndividualResend()
         MailStatusAdministrationSectionPage statusPage = MailStatusAdministrationSectionPage.gotoPage();
         TableLayoutElement tableLayout = statusPage.getLiveData().getTableLayout();
         tableLayout.filterColumn("Status", "send_error");
-        tableLayout.clickAction(1, "mailsendingaction_resend");
+        statusPage.clickAction(1, "mailsendingaction_resend");
 
         // Refresh the page and verify the mail to to@doe.com is in send_success state now
         statusPage = MailStatusAdministrationSectionPage.gotoPage();
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/src/main/java/org/xwiki/mail/test/po/MailStatusAdministrationSectionPage.java b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/src/main/java/org/xwiki/mail/test/po/MailStatusAdministrationSectionPage.java
index 14957f727464..1cb9d1d07c5c 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/src/main/java/org/xwiki/mail/test/po/MailStatusAdministrationSectionPage.java
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/src/main/java/org/xwiki/mail/test/po/MailStatusAdministrationSectionPage.java
@@ -19,12 +19,13 @@
  */
 package org.xwiki.mail.test.po;
 
+import org.openqa.selenium.By;
 import org.xwiki.administration.test.po.AdministrationSectionPage;
 import org.xwiki.livedata.test.po.LiveDataElement;
 
 /**
  * Represents the actions possible on the Mail Status Administration Page.
- * 
+ *
  * @version $Id$
  * @since 6.4RC1
  */
@@ -48,4 +49,15 @@ public LiveDataElement getLiveData()
     {
         return new LiveDataElement("sendmailstatus");
     }
+
+    /**
+     * Click on a mail action.
+     *
+     * @param rowNumber the row number in which to call the actions (start at 1 for the first row)
+     * @param actionName the name of the action (e.g., {@code mailsendingaction_resend})
+     */
+    public void clickAction(int rowNumber, String actionName)
+    {
+        getLiveData().getTableLayout().clickAction(rowNumber, By.cssSelector(String.format("[name='%s']", actionName)));
+    }
 }

From 1747a2378094724458613502f8d18beda7cc592f Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 12:05:57 +0100
Subject: [PATCH 084/143] [Misc] Use labeller to backport translations

  * Use a github action to automatically put backport labels on weblate
    pull requests
---
 .github/labeler.yml           | 11 +++++++++++
 .github/workflows/labeler.yml | 12 ++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000000..95853ff1bd58
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,11 @@
+backport stable-16.0.x:
+  - head-branch: ['^weblate']
+
+backport stable-15.10.x:
+  - head-branch: ['^weblate']
+
+backport stable-15.5.x:
+  - head-branch: ['^weblate']
+
+backport stable-14.10.x:
+  - head-branch: ['^weblate']
\ No newline at end of file
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000000..659ac26bb95e
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v5
\ No newline at end of file

From 85d09d350a3c7f700f6e909773bc2dc98cdc8b14 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:10:07 +0000
Subject: [PATCH 085/143] Translated using Weblate (French)

Currently translated at 66.6% (2 of 3 strings)

Translation: XWiki Platform/XWiki Platform Icon Default
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-icon-default/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
index ecf3c1d99816..43c78cf644c2 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
@@ -54,3 +54,10 @@
 ####################
 
 rendering.async.context.entry.icon.theme=Th\u00E8me des ic\u00F4nes
+
+####################
+# Required rights
+####################
+
+icon.requiredrights.object=Un th\u00E8me d'ic\u00F4ne requiert les droits script.
+### Missing: icon.requiredrights.content=The icon theme's content requires script right and might use programming right.

From 5cfdac6cbfb15a9d1ed6132419169060f461c527 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:09:51 +0000
Subject: [PATCH 086/143] Translated using Weblate (French)

Currently translated at 71.4% (10 of 14 strings)

Translation: XWiki Platform/UI Extension API
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/ui-extension-api/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
index 1a314d6a23fb..e390b1565bf0 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
@@ -50,6 +50,11 @@
 ###############################################################################
 
 uiextension.error.failed=\u00C9chec de l'ex\u00E9cution de l'UIX avec l'identifiant [{}]
+uiextension.requiredrights.global=Une extension de l'interface avec une port\u00E9e globale requiert les droits de programmation.
+### Missing: uiextension.requiredrights.wiki=A UI Extension with wiki scope requires wiki admin right.
+### Missing: uiextension.requiredrights.adminOnly=A UI Extension for the extension point [{0}] requires wiki admin right.
+### Missing: uiextension.requiredrights.parameters=Scripts in the parameters of the UI Extension require script right and possibly programming right.
+### Missing: uiextension.requiredrights.contentError=Error analyzing the content of the UI Extension, please review it manually: [{0}]
 rendering.macro.uiextension.name=Extension UI
 rendering.macro.uiextension.description=Ins\u00E9rez une extension UI.
 rendering.macro.uiextension.parameter.id.name=identifiant

From 708e83926a259d69e14f1c4e6ee1793f249e8e96 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:08:26 +0000
Subject: [PATCH 087/143] Translated using Weblate (French)

Currently translated at 100.0% (11 of 11 strings)

Translation: XWiki Platform/Attachment - Picker - Macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-attachment/attachment-picker-macro/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties
index 98f9902031ec..453e315bbbee 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties
@@ -27,4 +27,5 @@ rendering.macro.attachmentGalleryPicker.parameter.filter.description=Une liste d
 rendering.macro.attachmentGalleryPicker.parameter.limit.name=Limite
 rendering.macro.attachmentGalleryPicker.parameter.limit.description=Le nombre maximum de pi\u00E8ces jointes \u00E0 afficher
 attachment.picker.macro.notResult.message=Aucun r\u00E9sultat.
+attachment.picker.macro.globalSelection.message=La pi\u00E8ce jointe s\u00E9lectionn\u00E9e ne fait pas partie du document courant.
 attachment.picker.solrSearch.query.errorMessage=La requ\u00EAte de recherche des pi\u00E8ces jointes a \u00E9chou\u00E9.

From 3be33dcc1b882d7ec0359066771a4d06151e5f64 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:10:14 +0000
Subject: [PATCH 088/143] Translated using Weblate (French)

Currently translated at 75.0% (3 of 4 strings)

Translation: XWiki Platform/XWiki Platform - Attachment - Picker - UI
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-attachment-picker-ui/fr/
---
 .../main/resources/Attachment/Picker/Code/Translations.fr.xml   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
index 85efe2eaadbb..3b098f310120 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
@@ -38,5 +38,7 @@
   <hidden>true</hidden>
   <content>attachment.picker.ckeditor.pluginsImageSelector.title=Galerie
 attachment.picker.searchField.placeholder=Recherche...
+attachment.picker.searchField.scope.currentPage=Page Courante
+### Missing: attachment.picker.searchField.scope.allPages=All Pages
 </content>
 </xwikidoc>

From 769ae3fb29c7e3134bcd961034e48f176347ea6e Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:10:19 +0000
Subject: [PATCH 089/143] Translated using Weblate (French)

Currently translated at 77.7% (7 of 9 strings)

Translation: XWiki Platform/xwiki-platform-office-macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-office-macro/fr/
---
 .../ApplicationResources_fr.properties        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/src/main/resources/ApplicationResources_fr.properties
index b0522f8c2529..e64c7db4fb11 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/src/main/resources/ApplicationResources_fr.properties
@@ -1,6 +1,29 @@
+# ---------------------------------------------------------------------------
+# See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# ---------------------------------------------------------------------------
+
 rendering.macro.office.name=Liseuse de Document Office
 rendering.macro.office.description=Voir les pi\u00E8ces jointes office (doc, ppt, xls, odt, odp, ods etc.) au sein des pages wiki sans besoin de les t\u00E9l\u00E9charger ou de les importer.
+rendering.macro.office.parameter.reference.name=R\u00E9f\u00E9rence
+### Missing: rendering.macro.office.parameter.reference.description=The office file to be viewed. Use an resource string reference to specify which office file should be viewed: attach:file.ppt, attach:Page@file.doc, attach:Space.Page@file.xls, attach:wiki:Space.Page@file.odt, url:http://some/remote/file.ppt.
+### Missing: rendering.macro.office.parameter.reference.placeholder=Select or upload an office file
 rendering.macro.office.parameter.attachment.name=Pi\u00E8ce jointe
 rendering.macro.office.parameter.attachment.description=Pi\u00E8ce jointe office \u00E0 visionner. Indiquez la r\u00E9f\u00E9rence au fichier : fichier.ppt, Page@fichier.doc, Espace.Page@fichier.xls or wiki:Espace.Page@fichier.odt.
 rendering.macro.office.parameter.filterStyles.name=Filtrer les Styles
-rendering.macro.office.parameter.filterStyles.description=Filtrer ou pas les styles CSS en-ligne qui existent dans le contenu HTML produit par le serveur OpenOffice. Ceci est recommand\u00E9 car le contenu Office est d'habitude mieux int\u00E9gr\u00E9 dans la page wiki h\u00F4te lorsque les styles sont filtr\u00E9s.
\ No newline at end of file
+rendering.macro.office.parameter.filterStyles.description=Filtrer ou pas les styles CSS en-ligne qui existent dans le contenu HTML produit par le serveur OpenOffice. Ceci est recommand\u00E9 car le contenu Office est d'habitude mieux int\u00E9gr\u00E9 dans la page wiki h\u00F4te lorsque les styles sont filtr\u00E9s.

From 221b41c13c8bcce308013382b470aa73fa984480 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:08:56 +0000
Subject: [PATCH 090/143] Translated using Weblate (French)

Currently translated at 20.0% (1 of 5 strings)

Translation: XWiki Platform/Extension - Security - Index
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-extension/xwiki-platform-extension-security/extension-security-index/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/src/main/resources/ApplicationResources_fr.properties
index db4b37216c8f..8225610e78b9 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/src/main/resources/ApplicationResources_fr.properties
@@ -19,3 +19,7 @@
 # ---------------------------------------------------------------------------
 
 extension.security.analysis.advice.upgradeFromEM=Cette extension peut \u00EAtre mise \u00E0 jour \u00E0 partir du gestionnaire d'extension.
+extension.security.analysis.advice.upgradeFromEM.0=gestionnaire d'extension
+### Missing: extension.security.analysis.advice.transitive=This extension is installed because it is required by another extension. It is not advised to manually upgrade it. Instead, you should upgrade the extension requiring it. Please see them listed below.
+### Missing: extension.security.analysis.advice.upgradeXWiki=This extension is directly provided by XWiki and can't be upgraded using the extension manager. Please monitor for new versions of XWiki. Note that you should check in the release notes if this extension has been upgraded to a version with a security fix.
+### Missing: extension.security.analysis.advice.upgradeEnvironment=Please monitor for new versions of your environment (e.g., servlet engine) with a security fix, and upgrade accordingly.

From 567e00fa710ee804261ed8c46175e44288b60b90 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:43:54 +0000
Subject: [PATCH 091/143] Translated using Weblate (French)

Currently translated at 100.0% (3 of 3 strings)

Translation: XWiki Platform/XWiki Platform Icon Default
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-icon-default/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
index 43c78cf644c2..ae6daf44286e 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/src/main/resources/ApplicationResources_fr.properties
@@ -60,4 +60,4 @@ rendering.async.context.entry.icon.theme=Th\u00E8me des ic\u00F4nes
 ####################
 
 icon.requiredrights.object=Un th\u00E8me d'ic\u00F4ne requiert les droits script.
-### Missing: icon.requiredrights.content=The icon theme's content requires script right and might use programming right.
+icon.requiredrights.content=Le contenu du th\u00E8me d'ic\u00F4ne requiert les droits de script et peut utiliser les droits de programmation.

From b373c50bb5acc780ef1b797cf67b3432781daa4e Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:38:58 +0000
Subject: [PATCH 092/143] Translated using Weblate (French)

Currently translated at 50.0% (3 of 6 strings)

Translation: XWiki Platform/Rendering XWiki
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/rendering-xwiki/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources_fr.properties
index e5a8e1d2ae5b..3549087dfe29 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources_fr.properties
@@ -44,3 +44,7 @@
 
 rendering.error.causedBy=Cause : [{0}].
 rendering.error.click=Cliquer sur ce message pour voir plus de d\u00E9tails.
+rendering.macro.rawMacroRequiredRights=L'utilisation de la macro raw pour l'affichage de contenu HTML requiert les droits de script.
+### Missing: rendering.macro.htmlRequiredRights.noClean=An HTML macro with cleaning disabled requires script right.
+### Missing: rendering.macro.htmlRequiredRights.wikiContent=An HTML macro with wiki content could require script right depending on the content, please review the content carefully.
+### Missing: rendering.macro.htmlRequiredRights.dangerousContent=An HTML macro that contains content that would be removed by cleaning in restricted mode requires script right to avoid restricted cleaning.

From 6a0cefb78040666b1e8d2545a12cd26e60d45277 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:39:27 +0000
Subject: [PATCH 093/143] Translated using Weblate (French)

Currently translated at 78.5% (11 of 14 strings)

Translation: XWiki Platform/UI Extension API
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/ui-extension-api/fr/
---
 .../src/main/resources/ApplicationResources_fr.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
index e390b1565bf0..8171f1a02d81 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/src/main/resources/ApplicationResources_fr.properties
@@ -51,7 +51,7 @@
 
 uiextension.error.failed=\u00C9chec de l'ex\u00E9cution de l'UIX avec l'identifiant [{}]
 uiextension.requiredrights.global=Une extension de l'interface avec une port\u00E9e globale requiert les droits de programmation.
-### Missing: uiextension.requiredrights.wiki=A UI Extension with wiki scope requires wiki admin right.
+uiextension.requiredrights.wiki=Une extension de l'interface avec une port\u00E9e wiki requiert les droits d'administration du wiki.
 ### Missing: uiextension.requiredrights.adminOnly=A UI Extension for the extension point [{0}] requires wiki admin right.
 ### Missing: uiextension.requiredrights.parameters=Scripts in the parameters of the UI Extension require script right and possibly programming right.
 ### Missing: uiextension.requiredrights.contentError=Error analyzing the content of the UI Extension, please review it manually: [{0}]

From 58a764a71c15ccb2e801ff0bbf03aa924dbc4a69 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Sun, 4 Feb 2024 11:44:00 +0000
Subject: [PATCH 094/143] Translated using Weblate (French)

Currently translated at 100.0% (4 of 4 strings)

Translation: XWiki Platform/XWiki Platform - Attachment - Picker - UI
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-attachment-picker-ui/fr/
---
 .../main/resources/Attachment/Picker/Code/Translations.fr.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
index 3b098f310120..8e27c043fff3 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml
@@ -39,6 +39,6 @@
   <content>attachment.picker.ckeditor.pluginsImageSelector.title=Galerie
 attachment.picker.searchField.placeholder=Recherche...
 attachment.picker.searchField.scope.currentPage=Page Courante
-### Missing: attachment.picker.searchField.scope.allPages=All Pages
+attachment.picker.searchField.scope.allPages=Toutes les Pages
 </content>
 </xwikidoc>

From 9a665fdd9a1bb034fad97e2bc7d3514f97f72ac3 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 5 Feb 2024 10:17:06 +0100
Subject: [PATCH 095/143] XWIKI-21859: Upgrade to Joda-Time 2.12.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5ca860fdf509..523a5ccc3432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.12.6</version>
+        <version>2.12.7</version>
       </dependency>
       <!-- Common WebJars -->
       <dependency>

From 4ace87329963aaa4ef8135523c90aa9c39fc2744 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 5 Feb 2024 10:27:35 +0100
Subject: [PATCH 096/143] XWIKI-21860: Upgrade to Syntax higlighting 4.7.1

---
 .../xwiki-platform-distribution-flavor-common/pom.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
index c96ec05ce520..f63dd0f982e4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
@@ -254,7 +254,7 @@
     <dependency>
       <groupId>org.xwiki.contrib.editortool</groupId>
       <artifactId>editor-tool-highlighting-ui</artifactId>
-      <version>4.7</version>
+      <version>4.7.1</version>
       <type>xar</type>
       <optional>true</optional>
       <exclusions>

From fd96460864bd51cb14aac479f066c0f9721595be Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 5 Feb 2024 10:40:07 +0100
Subject: [PATCH 097/143] [misc] Update contrib dependencies related hacks in
 the pom

---
 xwiki-platform-distribution/pom.xml           | 24 ++++---------------
 .../pom.xml                                   |  6 -----
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/xwiki-platform-distribution/pom.xml b/xwiki-platform-distribution/pom.xml
index 23bfeb584fee..07b52a90e467 100644
--- a/xwiki-platform-distribution/pom.xml
+++ b/xwiki-platform-distribution/pom.xml
@@ -212,35 +212,19 @@
   </properties>
 
   <!-- Avoid enforce-upper-bounds rule complains (they're actually false positives since Extension Manager is not
-       affected by that) -->
+       affected by that)
+       Indicate the actual version instead of ${project.version} for xwiki-platform artifacts so that this parent pom
+       can be reused by contrib extensions. -->
   <dependencyManagement>
     <dependencies>
-      <!-- application-tour-ui -->
-      <dependency>
-        <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-appwithinminutes-ui</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
-        <type>xar</type>
-      </dependency>
-      <dependency>
-        <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-security-authorization-script</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-webjars-api</artifactId>
         <version>16.1.0-SNAPSHOT</version>
       </dependency>
-      <!-- application-ckeditor-ui -->
-      <dependency>
-        <groupId>org.xwiki.rendering</groupId>
-        <artifactId>xwiki-rendering-macro-html</artifactId>
-        <version>${rendering.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-tree-webjar</artifactId>
+        <artifactId>xwiki-platform-rendering-macro-velocity</artifactId>
         <version>16.1.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
index f63dd0f982e4..e7164d9653d0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
@@ -257,12 +257,6 @@
       <version>4.7.1</version>
       <type>xar</type>
       <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.xwiki.platform</groupId>
-          <artifactId>xwiki-platform-webjars</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Needed for editor-tool-highlighting-ui because it's depending on some old version of xwiki-platform-webjars
          which has now been moved into xwiki-platform-webjar-api -->

From 0c92506e9ea19b58c091aaa37151df3b5c73505f Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 5 Feb 2024 10:43:14 +0100
Subject: [PATCH 098/143] XWIKI-21861: Upgrade to RssReader 3.6.0

---
 .../xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
index d81f224aa8da..56a5091c05ce 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.apptasticsoftware</groupId>
       <artifactId>rssreader</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.xwiki.commons</groupId>

From 3a375b0b7655f3b45d4c1cafffdb42409a63c83b Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Tue, 6 Feb 2024 10:01:36 +0100
Subject: [PATCH 099/143] XWIKI-18998: Replace the Livetable of the System
 Filters of the Notifications Administration with a Live Data macro (#2827)

---
 pom.xml                                       |   18 +
 .../livedata/test/po/TableLayoutElement.java  |    9 +
 .../xwiki-platform-livedata-webjar/pom.xml    |   11 +-
 .../src/main/config/package.json              |    2 +-
 .../src/main/vue/main.mjs                     |   31 +
 .../src/main/vue/utilities/XWikiIcon.vue      |    3 +
 .../src/main/webjar/Logic.js                  |    3 +-
 .../xwiki-platform-notifications/pom.xml      |    1 +
 .../pom.xml                                   |    6 +-
 ...FilterPreferenceConfigurationResolver.java |   61 +
 ...otificationFilterPreferenceEntryStore.java |  245 ++
 ...icationFilterPreferenceLiveDataSource.java |   64 +
 ...lterPreferencePropertyDescriptorStore.java |  118 +
 .../main/resources/META-INF/components.txt    |    4 +
 .../test/ui/NotificationsEmailsIT.java        |    2 +-
 .../pom.xml                                   |    6 +
 .../po/AbstractNotificationsSettingsPage.java |   42 +-
 .../AbstractNotificationFilterPreference.java |   53 +-
 .../CustomNotificationFilterPreference.java   |   25 +-
 .../SystemNotificationFilterPreference.java   |   24 +-
 .../xwiki-platform-notifications-ui/pom.xml   |   21 +
 ...cationFilterPreferenceLivetableResults.xml |   20 +-
 ...ficationsSystemFiltersPreferencesMacro.xml |  633 +--
 .../XWiki/Notifications/Code/Translations.xml |    1 +
 .../pom.xml                                   |  160 +
 .../src/main/vue/.eslintrc.cjs                |   12 +
 .../src/main/vue/.gitignore                   |   27 +
 .../src/main/vue/package-lock.json            | 3450 +++++++++++++++++
 .../src/main/vue/package.json                 |   28 +
 .../vue/src/components/DisplayerToggle.vue    |  134 +
 .../src/main/vue/src/main.js                  |   23 +
 .../src/main/vue/vite.config.js               |   47 +
 32 files changed, 4785 insertions(+), 499 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/main.mjs
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.eslintrc.cjs
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.gitignore
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package-lock.json
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package.json
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/components/DisplayerToggle.vue
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/main.js
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/vite.config.js

diff --git a/pom.xml b/pom.xml
index 523a5ccc3432..3cbce2649db1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1167,6 +1167,19 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.webjars.npm</groupId>
+        <artifactId>vue</artifactId>
+        <version>2.7.16</version>
+        <exclusions>
+          <!-- Excluded because this dependency is 1) not used at runtime since all out components are pre-compiled 2) 
+          not currently deployable on webjars.org (see https://github.com/webjars/webjars/issues/1976)  -->
+          <exclusion>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>vue__compiler-sfc</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -1510,6 +1523,11 @@
             <options>esversion:11,maxparams:5,maxdepth:3,maxstatements:20,maxcomplexity:10,camelcase,maxlen:120</options>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>com.github.eirslett</groupId>
+          <artifactId>frontend-maven-plugin</artifactId>
+          <version>1.15.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
index 40a2823f4c85..9f0162ec7ebd 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/src/main/java/org/xwiki/livedata/test/po/TableLayoutElement.java
@@ -76,6 +76,15 @@ public class TableLayoutElement extends BaseElement
 
     private final LiveDataElement liveData;
 
+    /**
+     * @return the list of rows {@link WebElement}s
+     * @since 16.1.0RC1
+     */
+    public List<WebElement> getRows()
+    {
+        return getRoot().findElements(By.cssSelector("tbody > tr"));
+    }
+
     /**
      * A matcher for the cell containing links. The matcher assert of a given {@link WebElement} contains a {@code a}
      * tag with the expected text and link.
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
index a8e406d7e2aa..bd62452b050d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
@@ -51,15 +51,7 @@
     <dependency>
       <groupId>org.webjars.npm</groupId>
       <artifactId>vue</artifactId>
-      <version>2.7.16</version>
-      <exclusions>
-        <!-- Excluded because this dependency is 1) not used at runtime since all out components are pre-compiled 2) 
-        not currently deployable on webjars.org (see https://github.com/webjars/webjars/issues/1976)  -->
-        <exclusion>
-          <groupId>org.webjars.npm</groupId>
-          <artifactId>vue__compiler-sfc</artifactId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
     </dependency>
     <!-- Used by the date filter. -->
     <dependency>
@@ -159,7 +151,6 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.15.0</version>
         <executions>
           <execution>
             <id>install-node-and-npm</id>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
index b425d9511217..ddc2b4acc5bb 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "build": "vue-cli-service build --target lib --formats umd-min XWikiLivedata.vue",
+    "build": "vue-cli-service build --target lib --formats umd-min main.mjs",
     "inspect": "vue-cli-service inspect > inspection.js",
     "lint": "vue-cli-service lint . --no-fix",
     "test": "vue-cli-service test:unit"
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/main.mjs b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/main.mjs
new file mode 100644
index 000000000000..659c68d45d4e
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/main.mjs
@@ -0,0 +1,31 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import displayerMixin from "./displayers/displayerMixin.js";
+import BaseDisplayer from "./displayers/BaseDisplayer.vue";
+import XWikiIcon from "./utilities/XWikiIcon.vue";
+import XWikiLivedata from "./XWikiLivedata.vue"
+
+// Export the elements that are expected to be imported from other modules.
+export {
+  displayerMixin,
+  BaseDisplayer,
+  XWikiIcon,
+  XWikiLivedata
+}
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/utilities/XWikiIcon.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/utilities/XWikiIcon.vue
index ce6502e5548b..ca0f22ed2cdc 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/utilities/XWikiIcon.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/utilities/XWikiIcon.vue
@@ -125,6 +125,9 @@ export default {
         }
         // Set the icon to the resolved value of the promise.
         this.remoteIconDescriptor = await iconCache[iconName];
+        // Send a ready even once initialize so that parent containers can know when this component is in a stable 
+        // state. 
+        this.$emit('ready');
       },
       immediate: true
     },
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
index a19265005f6d..ec8d87090a14 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/webjar/Logic.js
@@ -30,11 +30,12 @@ define('xwiki-livedata', [
 ], function(
   Vue,
   VueI18n,
-  XWikiLivedata,
+  xwikiLivedataVue,
   liveDataSourceModule,
   jsonMerge,
   editBus
 ) {
+  const XWikiLivedata = xwikiLivedataVue.XWikiLivedata;
   /**
    * Make vue use the i18n plugin
    */
diff --git a/xwiki-platform-core/xwiki-platform-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
index 9e0883197af6..cd510f1de19d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
@@ -41,6 +41,7 @@
     <module>xwiki-platform-notifications-sources</module>
     <module>xwiki-platform-notifications-ui</module>
     <module>xwiki-platform-notifications-macro</module>
+    <module>xwiki-platform-notifications-webjar</module>
   </modules>
   <profiles>
     <profile>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
index 01b5b12399b0..8c8ca4df868e 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
@@ -45,7 +45,11 @@
       <artifactId>xwiki-platform-oldcore</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-livedata-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.xwiki.commons</groupId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
new file mode 100644
index 000000000000..84d2ac43958c
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
@@ -0,0 +1,61 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications.filters.internal.livedata;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.livedata.LiveDataConfiguration;
+import org.xwiki.livedata.LiveDataConfigurationResolver;
+import org.xwiki.livedata.LiveDataEntryDescriptor;
+import org.xwiki.livedata.LiveDataException;
+import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
+import org.xwiki.livedata.internal.JSONMerge;
+
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE;
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.FILTER_PREFERENCE_ID;
+
+/**
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@Component
+@Named(NOTIFICATION_FILTER_PREFERENCE)
+@Singleton
+public class NotificationFilterPreferenceConfigurationResolver
+    implements LiveDataConfigurationResolver<LiveDataConfiguration>
+{
+    @Inject
+    @Named(NOTIFICATION_FILTER_PREFERENCE)
+    private LiveDataPropertyDescriptorStore liveDataPropertyDescriptorStore;
+
+    @Override
+    public LiveDataConfiguration resolve(LiveDataConfiguration input) throws LiveDataException
+    {
+        LiveDataConfiguration liveDataConfiguration = new LiveDataConfiguration();
+        liveDataConfiguration.getMeta().setPropertyDescriptors(this.liveDataPropertyDescriptorStore.get());
+        LiveDataEntryDescriptor entryDescriptor = new LiveDataEntryDescriptor();
+        entryDescriptor.setIdProperty(FILTER_PREFERENCE_ID);
+        liveDataConfiguration.getMeta().setEntryDescriptor(entryDescriptor);
+        return new JSONMerge().merge(input, liveDataConfiguration);
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
new file mode 100644
index 000000000000..0366710bf25a
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
@@ -0,0 +1,245 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications.filters.internal.livedata;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.livedata.LiveData;
+import org.xwiki.livedata.LiveDataEntryStore;
+import org.xwiki.livedata.LiveDataException;
+import org.xwiki.livedata.LiveDataQuery;
+import org.xwiki.localization.ContextualLocalizationManager;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.model.reference.DocumentReferenceResolver;
+import org.xwiki.model.reference.LocalDocumentReference;
+import org.xwiki.model.reference.WikiReference;
+import org.xwiki.notifications.NotificationException;
+import org.xwiki.notifications.filters.NotificationFilter;
+import org.xwiki.notifications.filters.NotificationFilterManager;
+import org.xwiki.notifications.filters.NotificationFilterPreference;
+import org.xwiki.notifications.filters.NotificationFilterPreferenceManager;
+import org.xwiki.notifications.filters.internal.ToggleableNotificationFilter;
+import org.xwiki.security.authorization.ContextualAuthorizationManager;
+import org.xwiki.security.authorization.Right;
+
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.objects.BaseObject;
+
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE;
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.FILTER_PREFERENCE_ID;
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.ID_PROPERTY;
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.IS_ENABLED_PROPERTY;
+import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.NAME_PROPERTY;
+
+/**
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@Component
+@Named(NOTIFICATION_FILTER_PREFERENCE)
+@Singleton
+public class NotificationFilterPreferenceEntryStore implements LiveDataEntryStore
+{
+    private static final String USER_SOURCE_PARAM = "user";
+
+    @Inject
+    private DocumentReferenceResolver<String> entityReferenceResolver;
+
+    @Inject
+    private ContextualAuthorizationManager contextualAuthorizationManager;
+
+    @Inject
+    private NotificationFilterPreferenceManager notificationFilterPreferenceManager;
+
+    @Inject
+    private Provider<XWikiContext> xWikiContextProvider;
+
+    @Inject
+    private NotificationFilterManager notificationFilterManager;
+
+    @Inject
+    private ContextualLocalizationManager l10n;
+
+    @Override
+    public Optional<Map<String, Object>> get(Object entryId) throws LiveDataException
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    public LiveData get(LiveDataQuery query) throws LiveDataException
+    {
+        // TODO port the select logic here
+        Map<String, Object> sourceParameters = query.getSource().getParameters();
+
+        boolean isAccessGranted = true;
+        DocumentReference requestedUserDocRef = null;
+        XWikiContext xWikiContext = this.xWikiContextProvider.get();
+        WikiReference wikiReference = null;
+        String user = (String) sourceParameters.getOrDefault(USER_SOURCE_PARAM, "");
+        XWikiDocument document;
+        try {
+            if (!user.isEmpty()) {
+                requestedUserDocRef = this.entityReferenceResolver.resolve(user);
+                isAccessGranted = this.contextualAuthorizationManager.hasAccess(Right.ADMIN, requestedUserDocRef)
+                    || xWikiContext.getUserReference().equals(requestedUserDocRef);
+                document = xWikiContext.getWiki().getDocument(requestedUserDocRef, xWikiContext);
+            } else {
+                wikiReference = xWikiContext.getWikiReference();
+                document = xWikiContext.getWiki().getDocument(
+                    new LocalDocumentReference(List.of("XWiki", "Notifications", "Code"), "NotificationAdministration"),
+                    xWikiContext);
+            }
+        } catch (XWikiException e) {
+            // TODO: improve message
+            throw new LiveDataException("Failed to access document...", e);
+        }
+
+        if (!isAccessGranted) {
+            // TODO: improve error message.
+            throw new LiveDataException("Access not allowed");
+        }
+
+        Object type = sourceParameters.getOrDefault("type", "");
+        boolean displaySystem = true;
+        boolean displayCustom = true;
+        if (type.equals("custom")) {
+            displaySystem = false;
+        } else if (type.equals("system")) {
+            displayCustom = false;
+        }
+
+        long index = 0;
+        Long offset = query.getOffset();
+        long limitOffset = offset + query.getLimit();
+
+        List<Map<String, Object>> entries = new ArrayList<>();
+        if (displaySystem) {
+            Set<NotificationFilter> systemFilters = getSystemFilters(requestedUserDocRef, wikiReference);
+            for (NotificationFilter filter : systemFilters) {
+                index += 1;
+                if (isInRange(index, offset, limitOffset)) {
+                    boolean isEnabled = filter instanceof ToggleableNotificationFilter
+                        && ((ToggleableNotificationFilter) filter).isEnabledByDefault();
+                    String objectNumber = "";
+                    BaseObject obj =
+                        document.getXObject(new LocalDocumentReference(List.of("XWiki", "Notifications", "Code"),
+                            "ToggleableFilterPreferenceClass"));
+                    if (obj != null) {
+                        isEnabled = obj.getIntValue("isEnabled") != 0;
+                        objectNumber = String.valueOf(obj.getNumber());
+                    }
+
+                    entries.add(buildEntry(filter, isEnabled, objectNumber));
+                }
+            }
+        }
+
+        // Continue with the display custom fields only 
+        if (displayCustom && isInRange(index, offset, limitOffset)) {
+
+        }
+
+        LiveData liveData = new LiveData();
+        // TODO: define count...
+        liveData.setCount(0);
+//        entries.sort(Comparator.comparing(o -> ((String) o.getOrDefault("name", ""))));
+        liveData.getEntries().addAll(entries);
+        return liveData;
+    }
+
+    private static boolean isInRange(long index, Long offset, long limitOffset)
+    {
+        return index > offset && index <= limitOffset;
+    }
+
+    private Map<String, Object> buildEntry(NotificationFilter systemFilter, boolean isEnabled,
+        String objectNumber)
+    {
+        String name = this.l10n.getTranslationPlain(
+            "notifications.filters.name.%s".formatted(systemFilter.getName()));
+        Map<String, Object> entry = Map.of(
+            FILTER_PREFERENCE_ID, name,
+            NAME_PROPERTY, name,
+            ID_PROPERTY, "notificationFormats",
+            "%s_checked".formatted(IS_ENABLED_PROPERTY), isEnabled,
+            "%s_data".formatted(IS_ENABLED_PROPERTY), Map.of(
+                "objectNumber", objectNumber,
+                "filterName", systemFilter.getName()
+            )
+        );
+        return entry;
+    }
+
+    private List<NotificationFilter> getSystemFilters(DocumentReference requestedUserDocRef,
+        WikiReference wikiReference)
+        throws LiveDataException
+    {
+        try {
+            Collection<NotificationFilter> notificationFilters;
+            if (requestedUserDocRef != null) {
+                notificationFilters = this.notificationFilterManager.getAllFilters(requestedUserDocRef, false);
+            } else {
+                notificationFilters = this.notificationFilterManager.getAllFilters(wikiReference);
+            }
+            return this.notificationFilterManager.getToggleableFilters(notificationFilters)
+                .sorted(Comparator.comparing(NotificationFilter::getName))
+                .toList();
+        } catch (NotificationException e) {
+            throw new LiveDataException("Failed to get system filters", e);
+        }
+    }
+
+    private List<NotificationFilterPreference> getCustomFilters(DocumentReference requestedUserDocRef,
+        WikiReference wikiReference, NotificationFilter filter)
+        throws LiveDataException
+    {
+        // TODO: that's the second step, the fist one is to get the first list of filters
+        // ALso, need to re-read the velocity code to check that the parameters is correctly used.
+        try {
+            Collection<NotificationFilterPreference> notificationFilters;
+            if (requestedUserDocRef != null) {
+                notificationFilters =
+                    this.notificationFilterPreferenceManager.getFilterPreferences(requestedUserDocRef);
+            } else {
+                notificationFilters = this.notificationFilterPreferenceManager.getFilterPreferences(wikiReference);
+            }
+            return this.notificationFilterPreferenceManager.getFilterPreferences(notificationFilters, filter)
+                .sorted(Comparator.comparing(NotificationFilterPreference::getId))
+                .toList();
+        } catch (NotificationException e) {
+            throw new LiveDataException("Failed to get custom filters", e);
+        }
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
new file mode 100644
index 000000000000..d1e6344b8387
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
@@ -0,0 +1,64 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications.filters.internal.livedata;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.livedata.LiveDataEntryStore;
+import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
+import org.xwiki.livedata.LiveDataSource;
+
+/**
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@Component
+@Named(NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE)
+@Singleton
+public class NotificationFilterPreferenceLiveDataSource implements LiveDataSource
+{
+    /**
+     * This component hint.
+     */
+    public static final String NOTIFICATION_FILTER_PREFERENCE = "notificationFilterPreference";
+
+    @Inject
+    @Named(NOTIFICATION_FILTER_PREFERENCE)
+    private LiveDataEntryStore entryStore;
+
+    @Inject
+    @Named(NOTIFICATION_FILTER_PREFERENCE)
+    private LiveDataPropertyDescriptorStore propertyDescriptorStore;
+
+    @Override
+    public LiveDataEntryStore getEntries()
+    {
+        return this.entryStore;
+    }
+
+    @Override
+    public LiveDataPropertyDescriptorStore getProperties()
+    {
+        return this.propertyDescriptorStore;
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java
new file mode 100644
index 000000000000..75586edb0276
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java
@@ -0,0 +1,118 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications.filters.internal.livedata;
+
+import java.util.Collection;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.livedata.LiveDataException;
+import org.xwiki.livedata.LiveDataPropertyDescriptor;
+import org.xwiki.livedata.LiveDataPropertyDescriptor.DisplayerDescriptor;
+import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
+import org.xwiki.localization.ContextualLocalizationManager;
+
+/**
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@Component
+@Named(NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE)
+@Singleton
+public class NotificationFilterPreferencePropertyDescriptorStore implements LiveDataPropertyDescriptorStore
+{
+    public static final String NAME_PROPERTY = "name";
+
+    public static final String ID_PROPERTY = "notificationFormats";
+
+    public static final String FILTER_PREFERENCE_ID = "filterPreferenceId";
+
+    public static final String IS_ENABLED_PROPERTY = "isEnabled";
+
+    private static final String L10N_PREFIX = "notifications.settings.filters.preferences.system.table";
+
+    private static final String STRING_TYPE = "String";
+
+    private static final String HTML_DISPLAYER_ID = "html";
+
+    private static final String TOGGLE_DISPLAYER_ID = "toggle";
+
+    @Inject
+    private ContextualLocalizationManager l10n;
+
+    @Override
+    public Collection<LiveDataPropertyDescriptor> get() throws LiveDataException
+    {
+        return Set.of(
+            getName(),
+            getFilterType(),
+            getNotificationFormats(),
+            getIsEnabled()
+        );
+    }
+
+    private LiveDataPropertyDescriptor getFilterType()
+    {
+        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
+        String id = "filterType";
+        liveDataPropertyDescriptor.setId(id);
+        liveDataPropertyDescriptor.setName(getTranslationFromId(id));
+        liveDataPropertyDescriptor.setType(STRING_TYPE);
+        return liveDataPropertyDescriptor;
+    }
+
+    private LiveDataPropertyDescriptor getName()
+    {
+        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
+        liveDataPropertyDescriptor.setId(NAME_PROPERTY);
+        liveDataPropertyDescriptor.setName(getTranslationFromId(NAME_PROPERTY));
+        liveDataPropertyDescriptor.setType(STRING_TYPE);
+        return liveDataPropertyDescriptor;
+    }
+
+    private LiveDataPropertyDescriptor getIsEnabled()
+    {
+        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
+        liveDataPropertyDescriptor.setId(IS_ENABLED_PROPERTY);
+        liveDataPropertyDescriptor.setName(getTranslationFromId(IS_ENABLED_PROPERTY));
+        liveDataPropertyDescriptor.setType(STRING_TYPE);
+        liveDataPropertyDescriptor.setDisplayer(new DisplayerDescriptor(TOGGLE_DISPLAYER_ID));
+        return liveDataPropertyDescriptor;
+    }
+
+    private LiveDataPropertyDescriptor getNotificationFormats()
+    {
+        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
+        liveDataPropertyDescriptor.setId(ID_PROPERTY);
+        liveDataPropertyDescriptor.setName(getTranslationFromId(ID_PROPERTY));
+        liveDataPropertyDescriptor.setType(STRING_TYPE);
+        liveDataPropertyDescriptor.setDisplayer(new DisplayerDescriptor(HTML_DISPLAYER_ID));
+        return liveDataPropertyDescriptor;
+    }
+
+    private String getTranslationFromId(String id)
+    {
+        return this.l10n.getTranslationPlain("%s.%s".formatted(L10N_PREFIX, id));
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
index ef6153436b28..a51fa16dbee3 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
@@ -15,3 +15,7 @@ org.xwiki.notifications.filters.migration.R140401000XWIKI15460DataMigration
 org.xwiki.notifications.filters.migration.R151002000XWIKI21448DataMigration
 org.xwiki.notifications.filters.migration.R160000000XWIKI17243DataMigration
 org.xwiki.notifications.filters.migration.WatchListObjectsRemovalTaskConsumer
+org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceConfigurationResolver
+org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceEntryStore
+org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource
+org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java
index 0984671213ce..d152f7572954 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java
@@ -114,7 +114,7 @@ public void setup(TestUtils testUtils, TestConfiguration testConfiguration) thro
         p = NotificationsUserProfilePage.gotoPage(FIRST_USER_NAME);
         p.disableAllParameters();
         // Enable own filter
-        p.getNotificationFilterPreferences().get(2).setEnabled(true);
+        p.getSystemNotificationFilterPreferences().get(2).setEnabled(true);
 
         testUtils.login(SECOND_USER_NAME, SECOND_USER_PASSWORD);
         p = NotificationsUserProfilePage.gotoPage(SECOND_USER_NAME);
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
index 1edbb8f7f90f..187a9ba457c0 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
@@ -47,5 +47,11 @@
       <artifactId>xwiki-platform-index-tree-test-pageobjects</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- Required to test Live Data UIs. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-livedata-test-pageobjects</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
index 5b3dc7619e9e..6c8fb0703d90 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
@@ -27,21 +27,22 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
+import org.xwiki.livedata.test.po.LiveDataElement;
+import org.xwiki.livedata.test.po.TableLayoutElement;
 import org.xwiki.platform.notifications.test.po.preferences.AbstractNotificationPreferences;
 import org.xwiki.platform.notifications.test.po.preferences.ApplicationPreferences;
 import org.xwiki.platform.notifications.test.po.preferences.EventTypePreferences;
 import org.xwiki.platform.notifications.test.po.preferences.filters.CustomNotificationFilterModal;
 import org.xwiki.platform.notifications.test.po.preferences.filters.CustomNotificationFilterPreference;
-import org.xwiki.platform.notifications.test.po.preferences.filters.NotificationFilterPreference;
 import org.xwiki.platform.notifications.test.po.preferences.filters.SystemNotificationFilterPreference;
 import org.xwiki.test.ui.po.BootstrapSwitch;
 import org.xwiki.test.ui.po.Select;
 import org.xwiki.test.ui.po.ViewPage;
 
 /**
- * Represents a page for notification settings.
- * This kind of page can be seen in user profile or in global administration.
- * 
+ * Represents a page for notification settings. This kind of page can be seen in user profile or in global
+ * administration.
+ *
  * @version $Id$
  * @since 13.2RC1
  */
@@ -57,9 +58,6 @@ public abstract class AbstractNotificationsSettingsPage extends ViewPage
 
     private static final String ROW_TAG = "tr";
 
-    @FindBy(id = "notificationSystemFilterPreferencesLiveTable-display")
-    protected WebElement notificationSystemFilterPreferencesLivetable;
-
     @FindBy(id = "notificationCustomFilterPreferencesLiveTable-display")
     protected WebElement notificationCustomFilterPreferencesLivetable;
 
@@ -278,37 +276,19 @@ public void disableAllParameters()
         }
     }
 
-    /**
-     * @return the notification filter preferences, as they are described in the corresponding livetable
-     *
-     * @since 10.8RC1
-     * @since 9.11.8
-     * @deprecated Since 13.2RC1 you should use
-     *              {@link #getSystemNotificationFilterPreferences()} or
-     *              {@link #getCustomNotificationFilterPreferences()}.
-     */
-    @Deprecated
-    public List<NotificationFilterPreference> getNotificationFilterPreferences()
-    {
-        List<NotificationFilterPreference> preferences = new ArrayList<>();
-        for (WebElement row : this.notificationSystemFilterPreferencesLivetable.findElements(By.tagName(ROW_TAG))) {
-            preferences.add(new NotificationFilterPreference(this, row, this.getDriver()));
-        }
-        for (WebElement row : this.notificationCustomFilterPreferencesLivetable.findElements(By.tagName(ROW_TAG))) {
-            preferences.add(new NotificationFilterPreference(this, row, this.getDriver()));
-        }
-        return preferences;
-    }
-
     /**
      * @return the system notification filter preferences.
      * @since 13.2RC1
      */
     public List<SystemNotificationFilterPreference> getSystemNotificationFilterPreferences()
     {
+        LiveDataElement notificationSystemFilterPreferencesLiveData =
+            new LiveDataElement("notificationSystemFilterPreferencesLiveData");
+        TableLayoutElement tableLayout = notificationSystemFilterPreferencesLiveData.getTableLayout();
+
         List<SystemNotificationFilterPreference> preferences = new ArrayList<>();
-        for (WebElement row : this.notificationSystemFilterPreferencesLivetable.findElements(By.tagName(ROW_TAG))) {
-            preferences.add(new SystemNotificationFilterPreference(this, row, this.getDriver()));
+        for (WebElement row : tableLayout.getRows()) {
+            preferences.add(new SystemNotificationFilterPreference(this, row, getDriver()));
         }
         return preferences;
     }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
index 82f745ccb0d5..efd71a8e21d9 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
@@ -28,9 +28,13 @@
 import org.xwiki.test.ui.XWikiWebDriver;
 import org.xwiki.test.ui.po.BootstrapSwitch;
 
+import static org.xwiki.test.ui.po.BootstrapSwitch.State.OFF;
+import static org.xwiki.test.ui.po.BootstrapSwitch.State.ON;
+
 /**
  * Abstract representation of the notification filter preferences which covers common needs for
  * {@link SystemNotificationFilterPreference} and {@link CustomNotificationFilterPreference}.
+ *
  * @version $Id$
  * @since 13.2RC1
  */
@@ -38,15 +42,17 @@ public abstract class AbstractNotificationFilterPreference
 {
     private AbstractNotificationsSettingsPage parentPage;
 
-    private WebElement livetableRow;
+    private WebElement row;
 
     private String filterName;
+
     private List<String> formats = new ArrayList<>();
 
     private BootstrapSwitch enabledSwitch;
 
     /**
      * Default constructor.
+     *
      * @param parentPage the page where the settings are displayed.
      * @param row the row of the livetable for this filter.
      * @param webDriver the webdriver to initialize the switches.
@@ -55,19 +61,39 @@ public AbstractNotificationFilterPreference(AbstractNotificationsSettingsPage pa
         XWikiWebDriver webDriver)
     {
         this.parentPage = parentPage;
-        this.livetableRow = row;
-        this.filterName = row.findElement(By.className("name")).getText();
-        List<WebElement> formatElements = row.findElement(By.className("notificationFormats"))
+        this.row = row;
+        this.filterName = getNameElement(row).getText();
+        List<WebElement> formatElements = getFormatsElement(row)
             .findElements(By.tagName("li"));
         for (WebElement format : formatElements) {
             this.formats.add(format.getText());
         }
-        this.enabledSwitch = new BootstrapSwitch(
-            row.findElement(By.className("isEnabled")).findElement(By.className("bootstrap-switch")),
-            webDriver
-        );
+        this.enabledSwitch = new BootstrapSwitch(getBootstrapSwitchElement(row), webDriver);
     }
 
+    /**
+     * @param row the row to get the name from
+     * @return the {@link WebElement} containing the name of the row
+     * @since 16.1.0RC1
+     */
+    protected abstract WebElement getNameElement(WebElement row);
+
+    /**
+     * @param row the row to get the formats from
+     * @return the {@link WebElement} containing the formats of the row
+     * @since 16.1.0RC1
+     */
+
+    protected abstract WebElement getFormatsElement(WebElement row);
+
+    /**
+     * @param row the row to get the switch from
+     * @return the {@link WebElement} containing the switch element of the row
+     * @since 16.1.0RC1
+     */
+
+    protected abstract WebElement getBootstrapSwitchElement(WebElement row);
+
     /**
      * @return the filter name.
      */
@@ -85,11 +111,11 @@ public AbstractNotificationsSettingsPage getParentPage()
     }
 
     /**
-     * @return the livetable row.
+     * @return the row
      */
-    public WebElement getLivetableRow()
+    public WebElement getRow()
     {
-        return livetableRow;
+        return row;
     }
 
     /**
@@ -105,11 +131,12 @@ public List<String> getFormats()
      */
     public boolean isEnabled()
     {
-        return enabledSwitch.getState() == BootstrapSwitch.State.ON;
+        return enabledSwitch.getState() == ON;
     }
 
     /**
      * Enable or disable the current filter.
+     *
      * @param enabled either or not the filter must be enabled
      * @throws Exception if the expected state cannot be set
      */
@@ -119,7 +146,7 @@ public void setEnabled(boolean enabled) throws Exception
             return;
         }
 
-        this.enabledSwitch.setState(enabled ? BootstrapSwitch.State.ON : BootstrapSwitch.State.OFF);
+        this.enabledSwitch.setState(enabled ? ON : OFF);
         this.parentPage.waitForNotificationSuccessMessage("Filter preference saved!");
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
index 036a1384c90c..cf12d60ed4c3 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
@@ -39,6 +39,7 @@ public class CustomNotificationFilterPreference extends AbstractNotificationFilt
 {
     /**
      * Represents the possible actions for such filter.
+     *
      * @version $Id$
      */
     public enum FilterAction
@@ -55,10 +56,12 @@ public enum FilterAction
     }
 
     private List<String> eventTypes = new ArrayList<>();
+
     private FilterAction filterAction;
 
     /**
      * Default constructor.
+     *
      * @param parentPage the page where the settings are displayed.
      * @param row the row of the livetable for this filter.
      * @param webDriver the webdriver to initialize the switches.
@@ -84,6 +87,24 @@ public CustomNotificationFilterPreference(AbstractNotificationsSettingsPage pare
         }
     }
 
+    @Override
+    protected WebElement getNameElement(WebElement row)
+    {
+        return row.findElement(By.className("name"));
+    }
+
+    @Override
+    protected WebElement getFormatsElement(WebElement row)
+    {
+        return row.findElement(By.className("notificationFormats"));
+    }
+
+    @Override
+    protected WebElement getBootstrapSwitchElement(WebElement row)
+    {
+        return row.findElement(By.className("isEnabled")).findElement(By.className("bootstrap-switch"));
+    }
+
     /**
      * @return the event types or an empty list in case of all events.
      */
@@ -97,7 +118,7 @@ public List<String> getEventTypes()
      */
     public String getLocation()
     {
-        return this.getLivetableRow().findElement(By.cssSelector("td.name ol")).getAttribute("data-entity");
+        return this.getRow().findElement(By.cssSelector("td.name ol")).getAttribute("data-entity");
     }
 
     /**
@@ -113,7 +134,7 @@ public FilterAction getFilterAction()
      */
     public void delete()
     {
-        this.getLivetableRow().findElement(By.cssSelector("td.actions a.actiondelete")).click();
+        this.getRow().findElement(By.cssSelector("td.actions a.actiondelete")).click();
         ConfirmationBox confirmationBox = new ConfirmationBox();
         confirmationBox.clickYes();
         this.getParentPage().waitForNotificationSuccessMessage("Filter preference deleted!");
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
index 9a209e15f247..d4e78ccafa26 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
@@ -32,7 +32,7 @@
  */
 public class SystemNotificationFilterPreference extends AbstractNotificationFilterPreference
 {
-    private String description;
+    private final String description;
 
     /**
      * Default constructor.
@@ -44,7 +44,25 @@ public SystemNotificationFilterPreference(AbstractNotificationsSettingsPage pare
         XWikiWebDriver webDriver)
     {
         super(parentPage, row, webDriver);
-        this.description = row.findElement(By.className("filterType")).getText();
+        this.description = row.findElement(By.cssSelector("td[data-title='Description'] .view")).getText();
+    }
+
+    @Override
+    protected WebElement getNameElement(WebElement row)
+    {
+        return row.findElement(By.cssSelector("td[data-title='Name'] .view"));
+    }
+
+    @Override
+    protected WebElement getFormatsElement(WebElement row)
+    {
+        return row.findElement(By.cssSelector("td[data-title='Formats'] .view"));
+    }
+
+    @Override
+    protected WebElement getBootstrapSwitchElement(WebElement row)
+    {
+        return row.findElement(By.className("displayer-toggle")).findElement(By.className("bootstrap-switch"));
     }
 
     /**
@@ -52,6 +70,6 @@ public SystemNotificationFilterPreference(AbstractNotificationsSettingsPage pare
      */
     public String getDescription()
     {
-        return description;
+        return this.description;
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
index 545fc4c503a9..dfb24ffbd8ff 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
@@ -133,6 +133,27 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <!-- Live Data dependencies. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-livedata-macro</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-livedata-livetable</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <!-- Provides the DisplayerToggle Vue component. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-notifications-webjar</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <!-- Test dependencies. -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-test-page</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
index bb2d8b3ea2fe..2f0cc067349f 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
@@ -108,11 +108,11 @@
         #set ($objectNumber = $!obj.reference.objectNumber)
       #end
       #if ($checked)
-        #set ($checked = 'checked = "checked"')
+        #set ($checkedAttr = 'checked = "checked"')
       #else
-        #set ($checked = '')
+        #set ($checkedAttr = '')
       #end
-      #set ($checkbox = "&lt;input type='checkbox' class='toggleableFilterPreferenceCheckbox' data-objectNumber='${objectNumber}' data-filtername='${filter.name}' $checked /&gt;")
+      #set ($checkbox = "&lt;input type='checkbox' class='toggleableFilterPreferenceCheckbox' data-objectNumber='${objectNumber}' data-filtername='${filter.name}' $checkedAttr /&gt;")
       #set ($name = $services.localization.render("notifications.filters.name.$filter.name"))
       #set ($element = {
         'filterPreferenceId'  : $name,
@@ -122,7 +122,12 @@
         'notificationFormats' : "#displayNotificationFormatsList($filter.formats)",
         'isEnabled'           : $checkbox,
         'doc_viewable'        : true,
-        'doc_hasdelete'       : false
+        'doc_hasdelete'       : false,
+        'isEnabled_checked': $checked,
+        'isEnabled_data': {
+          'objectNumber': $objectNumber,
+          'filtername':  $filter.name
+        }
       })
       #set ($discard = $elements.add($element))
     #end
@@ -184,7 +189,12 @@
             'eventTypes'          : "#displayNotificationsEventTypeList($preference.eventTypes)",
             'notificationFormats' : "#displayNotificationFormatsList($preference.notificationFormats)",
             'isEnabled'           : $isEnabled,
-            'doc_viewable'        : true
+            'doc_viewable'        : true,
+            'isEnabled_checked': $preference.isEnabled(),
+            'isEnabled_disabled': $preference.id.startsWith('watchlist_'),
+            'isEnabled_data': {
+              'preferenceId': $preference.id
+            }
           })
           #set ($discard = $elements.add($element))
         #end
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
index cd3e306aa4dc..385e34cc9004 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
@@ -41,7 +41,7 @@
     <name>XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro</name>
     <number>0</number>
     <className>XWiki.JavaScriptExtension</className>
-    <guid>7e7d151b-e4dd-498b-8e50-f213104fa256</guid>
+    <guid>2655cc69-aa63-4958-b919-91d15f6589c9</guid>
     <class>
       <name>XWiki.JavaScriptExtension</name>
       <customClass/>
@@ -77,6 +77,7 @@
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -124,387 +125,96 @@
       <cache>long</cache>
     </property>
     <property>
-      <code>'use strict';
-/**
- * Start the real script.
- */
-require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($) {
-
-  /**
-   * Page initialization
-   */
-  $(function() {
-    var initBootstrapSwitches = function () {
-      $('#notificationSystemFilterPreferencesLiveTable .notificationFilterPreferenceCheckbox, #notificationSystemFilterPreferencesLiveTable .toggleableFilterPreferenceCheckbox').bootstrapSwitch({
-        size: 'mini',
-        labelText: '$escapetool.javascript($services.icon.renderHTML("bell"))'
-      });
-    };
-    $(document).on('xwiki:livetable:displayComplete', function (event, data) {
-      // Enable bootstrap switches
-      initBootstrapSwitches();
-    });
-    initBootstrapSwitches();
-
-  });
+      <code>define('notifications-system-filters-preferences-macro', {
+  prefix: 'notifications.',
+  keys: [
+    'settings.saving',
+    'filters.preferences.setEnabled.done',
+    'filters.preferences.setEnabled.error'
+  ]
 });
-</code>
-    </property>
-    <property>
-      <name>JS</name>
-    </property>
-    <property>
-      <parse>1</parse>
-    </property>
-    <property>
-      <use>currentPage</use>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro</name>
-    <number>2</number>
-    <className>XWiki.JavaScriptExtension</className>
-    <guid>f3d87be8-97d5-490f-b519-952b54fc3e69</guid>
-    <class>
-      <name>XWiki.JavaScriptExtension</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <cache>
-        <cache>0</cache>
-        <defaultValue>long</defaultValue>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>cache</name>
-        <number>5</number>
-        <prettyName>Caching policy</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>long|short|default|forbid</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </cache>
-      <code>
-        <contenttype>PureText</contenttype>
-        <disabled>0</disabled>
-        <editor>PureText</editor>
-        <name>code</name>
-        <number>2</number>
-        <prettyName>Code</prettyName>
-        <rows>20</rows>
-        <size>50</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-      </code>
-      <name>
-        <disabled>0</disabled>
-        <name>name</name>
-        <number>1</number>
-        <prettyName>Name</prettyName>
-        <size>30</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </name>
-      <parse>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>yesno</displayType>
-        <name>parse</name>
-        <number>4</number>
-        <prettyName>Parse content</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </parse>
-      <use>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>use</name>
-        <number>3</number>
-        <prettyName>Use this extension</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>currentPage|onDemand|always</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </use>
-    </class>
-    <property>
-      <cache>long</cache>
-    </property>
-    <property>
-      <code>define('SystemToggleableFilterPreference', ['jquery', 'xwiki-bootstrap-switch'], function($) {
-  /**
-  * Construct the Toggleable Filter Preference object.
-  */
-  return function(domElement, docURL, row) {
-    var self               = this;
-    self.domElement        = $(domElement);
-    self.docURL           = docURL;
-    self.row               = row;
-    /**
-     * Initialization
-     */
-    self.init = function () {
-      // On change
-      self.domElement.off('switchChange.bootstrapSwitch.systemFilter')
-        .on('switchChange.bootstrapSwitch.systemFilter', function(event, state) {
-          setTimeout(function() { self.save(state); }, 1);
-        });
-    };
 
-    /**
-     * Save the filter preference
-     */
-    self.save = function(state) {
-      var notification = new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.settings.saving'))", 'inprogress');
-      var filterName = self.domElement.attr('data-filterName');
-      var objectNumber = self.domElement.attr('data-objectNumber');
-      if (objectNumber == '') {
-        // If the object does not exist yet, create it (make this change a minor edit so it's not displayed, by default, in notifications)
-        var restURL = self.docURL + '/objects?media=json&amp;minorRevision=true';
-        var params = {
+require(['jquery', 'xwiki-l10n!notifications-system-filters-preferences-macro', 'vue', 'xwiki-platform-notifications-webjar'], function ($, l10n, Vue, notifications) {
+  Vue.component('DisplayerToggle', notifications.DisplayerToggle)
+
+  function save(checked, filterName, objectNumber, docURL) {
+    return new Promise((resolve) =&gt; {
+      const notification = new XWiki.widgets.Notification(l10n['settings.saving'], 'inprogress');
+      if (objectNumber === '') {
+        // If the object does not exist yet, create it (make this change a minor edit so it's not displayed, by default,
+        // in notifications)
+        const restURL = docURL + '/objects?media=json&amp;minorRevision=true';
+        const params = {
           'className': 'XWiki.Notifications.Code.ToggleableFilterPreferenceClass',
           'property#filterName': filterName,
-          'property#isEnabled': state ? '1' : '0'
+          'property#isEnabled': checked ? '1' : '0'
         };
         $.post(restURL, params).then(data =&gt; {
-          self.domElement.attr('data-objectNumber', data.number);
           notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.done'))", 'done');
+          new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.done'], 'done');
+          resolve({objectNumber: data.number, checked})
         }).catch(() =&gt; {
           notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.error'))", 'error');
+          new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.error'], 'error');
+          resolve({checked: !checked});
         });
-      } else if (objectNumber != '') {
-        // If the object already exist, just update its value (make this change a minor edit so it's not displayed, by default, in notifications)
-        var restURL = self.docURL + '/objects/XWiki.Notifications.Code.ToggleableFilterPreferenceClass/' + objectNumber
+      } else if (objectNumber !== '') {
+        // If the object already exist, just update its value (make this change a minor edit so it's not displayed, by
+        // default, in notifications)
+        const restURL = docURL + '/objects/XWiki.Notifications.Code.ToggleableFilterPreferenceClass/' + objectNumber
           + '/properties/isEnabled?media=json&amp;minorRevision=true';
         $.ajax(restURL, {
           method: 'PUT',
           contentType: 'text/plain',
-          data: state ? '1' : '0'
-        }).then(data =&gt; {
+          data: checked ? '1' : '0'
+        }).then(() =&gt; {
           notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.done'))", 'done');
-          $(document).trigger('xwiki:livetable:notifications-filters-system:toggle', {'row': self.row, 'state': state});
+          new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.done'], 'done');
+          resolve({checked});
         }).catch(() =&gt; {
           notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.error'))", 'error');
+          new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.error'], 'error');
+          resolve({checked: !checked});
         });
       }
-    };
-
-    // Call init
-    self.init();
-  };
-});
-</code>
-    </property>
-    <property>
-      <name>System Toggleable Filter Preference</name>
-    </property>
-    <property>
-      <parse>1</parse>
-    </property>
-    <property>
-      <use>currentPage</use>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro</name>
-    <number>3</number>
-    <className>XWiki.JavaScriptExtension</className>
-    <guid>2ce1c5a8-4fdb-479f-85f7-7cbfe9b7d646</guid>
-    <class>
-      <name>XWiki.JavaScriptExtension</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <cache>
-        <cache>0</cache>
-        <defaultValue>long</defaultValue>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>cache</name>
-        <number>5</number>
-        <prettyName>Caching policy</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>long|short|default|forbid</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </cache>
-      <code>
-        <contenttype>PureText</contenttype>
-        <disabled>0</disabled>
-        <editor>PureText</editor>
-        <name>code</name>
-        <number>2</number>
-        <prettyName>Code</prettyName>
-        <rows>20</rows>
-        <size>50</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-      </code>
-      <name>
-        <disabled>0</disabled>
-        <name>name</name>
-        <number>1</number>
-        <prettyName>Name</prettyName>
-        <size>30</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </name>
-      <parse>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>yesno</displayType>
-        <name>parse</name>
-        <number>4</number>
-        <prettyName>Parse content</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </parse>
-      <use>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>use</name>
-        <number>3</number>
-        <prettyName>Use this extension</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>currentPage|onDemand|always</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </use>
-    </class>
-    <property>
-      <cache>long</cache>
-    </property>
-    <property>
-      <code>require([
-  'jquery',
-  'SystemToggleableFilterPreference',
-  'xwiki-meta',
-  'xwiki-bootstrap-switch',
-  'xwiki-events-bridge'
-], function ($, SystemToggleableFilterPreference, xm) {
-  $(document).on('xwiki:livetable:notifications-filters-system:toggle', function(event, data) {
-    var changedRow = $(data.row.isEnabled);
-    if (changedRow.length &gt; 0) {
-      if (data.state) {
-        changedRow.attr("checked", "checked");
-      } else {
-        changedRow.removeAttr("checked");
-      }
-      data.row.isEnabled = changedRow.get(0).outerHTML;
-    }
-  });
-
-  // Globals
-  var serviceReference = XWiki.Model.resolve('XWiki.Notifications.Code.NotificationPreferenceService',
-    XWiki.EntityType.DOCUMENT);
-  var serviceURL = new XWiki.Document(serviceReference).getURL('get', 'outputSyntax=plain');
-  var target = $('.systemFilterPreferences').attr('data-target');
+    })
+  }
 
-  var docURL = $('.systemFilterPreferences').attr('data-doc-url');
-  var postParams = {
-    action: 'setFilterPreferenceEnabled',
-    csrf: xm.form_token,
-    target: target
-  };
-  if (target == 'user') {
-    var targetUser = $('.systemFilterPreferences').attr('data-user');
-    postParams['user'] = targetUser;
-  };
+  const docURL = $('.systemFilterPreferences').attr('data-doc-url');
 
-  var enhanceRow = function(row, data) {
-    // Enable / Disable action for classic filter preferences
-    $(row).find('.notificationFilterPreferenceCheckbox').off('switchChange.bootstrapSwitch.systemFilter')
-    .on('switchChange.bootstrapSwitch.systemFilter', function(event, state) {
-      var notif = new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-        'notifications.filters.preferences.setEnabled.inProgress')), 'inprogress');
-      var params = {
-        filterPreferenceId: data.filterPreferenceId,
-        enabled: state
-      };
-      $.post(serviceURL, $.extend({}, params, postParams)).then(() =&gt; {
-        notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-          'notifications.filters.preferences.setEnabled.done')), 'done'));
-        $(document).trigger('xwiki:livetable:notifications-filters-system:toggle', {'row': data, 'state': state});
-      }).catch(() =&gt; {
-        notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-          'notifications.filters.preferences.setEnabled.error')), 'error'));
+  $(document).on('xwiki:livedata:toggle', '#notificationSystemFilterPreferencesLiveData', (event) =&gt; {
+    const detail = event.detail;
+    const data = detail.data
+    save(detail.checked, data.filtername, data.objectNumber, docURL).then(({checked, objectNumber}) =&gt; {
+      detail.callback({
+        ...detail,
+        data: {
+          ...data,
+          objectNumber: objectNumber !== undefined ? objectNumber : data.objectNumber
+        },
+        checked: checked
       });
     });
-    // Enable / Disable action for toggleable filter preferences
-    $(row).find('.toggleableFilterPreferenceCheckbox').each(function() {
-      new SystemToggleableFilterPreference(this, docURL, data);
-    });
-  };
-
-  // Callback on livetable row printing
-  $(document).on('xwiki:livetable:notificationSystemFilterPreferencesLiveTable:newrow', function(event, data) {
-    enhanceRow(data.row, data.data);
-  });
-
-  // Initializer
-  $(function() {
-    // This script is usually loaded after the live table is displayed and so the previous callback might not be called.
-    $('#notificationSystemFilterPreferencesLiveTable-display &gt; tr[data-index]').each(function() {
-      var data = window.livetable_notificationSystemFilterPreferencesLiveTable.fetchedRows[$(this).data('index')];
-      enhanceRow(this, data);
-    });
   });
-});</code>
+})</code>
     </property>
     <property>
-      <name>Filter Preferences Livetable Callback</name>
+      <name/>
     </property>
     <property>
-      <parse>1</parse>
+      <parse>0</parse>
     </property>
     <property>
-      <use>currentPage</use>
+      <use>onDemand</use>
     </property>
   </object>
   <object>
     <name>XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro</name>
     <number>0</number>
-    <className>XWiki.StyleSheetExtension</className>
-    <guid>0dbeaf20-9549-4eb2-99b9-95dc3fef916d</guid>
+    <className>XWiki.UIExtensionClass</className>
+    <guid>bc0fe9a6-4900-4c4a-849f-a62918a47493</guid>
     <class>
-      <name>XWiki.StyleSheetExtension</name>
+      <name>XWiki.UIExtensionClass</name>
       <customClass/>
       <customMapping/>
       <defaultViewSheet/>
@@ -512,112 +222,132 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
       <defaultWeb/>
       <nameField/>
       <validationScript/>
-      <cache>
+      <async_cached>
+        <defaultValue>0</defaultValue>
+        <disabled>0</disabled>
+        <displayFormType>select</displayFormType>
+        <displayType/>
+        <name>async_cached</name>
+        <number>3</number>
+        <prettyName>Cached</prettyName>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+      </async_cached>
+      <async_context>
         <cache>0</cache>
-        <defaultValue>long</defaultValue>
         <disabled>0</disabled>
         <displayType>select</displayType>
         <freeText>forbidden</freeText>
         <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>cache</name>
-        <number>5</number>
-        <prettyName>Caching policy</prettyName>
+        <multiSelect>1</multiSelect>
+        <name>async_context</name>
+        <number>4</number>
+        <prettyName>Context elements</prettyName>
         <relationalStorage>0</relationalStorage>
-        <separator> </separator>
+        <separator>, </separator>
         <separators>|, </separators>
-        <size>1</size>
+        <size>5</size>
         <unmodifiable>0</unmodifiable>
-        <values>long|short|default|forbid</values>
+        <values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </cache>
-      <code>
-        <contenttype>PureText</contenttype>
+      </async_context>
+      <async_enabled>
+        <defaultValue>0</defaultValue>
         <disabled>0</disabled>
-        <editor>PureText</editor>
-        <name>code</name>
+        <displayFormType>select</displayFormType>
+        <displayType/>
+        <name>async_enabled</name>
         <number>2</number>
-        <prettyName>Code</prettyName>
-        <rows>20</rows>
-        <size>50</size>
+        <prettyName>Asynchronous rendering</prettyName>
+        <unmodifiable>0</unmodifiable>
+        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+      </async_enabled>
+      <content>
+        <disabled>0</disabled>
+        <editor>Text</editor>
+        <name>content</name>
+        <number>1</number>
+        <prettyName>Executed Content</prettyName>
+        <restricted>0</restricted>
+        <rows>25</rows>
+        <size>120</size>
         <unmodifiable>0</unmodifiable>
         <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-      </code>
-      <contentType>
-        <cache>0</cache>
+      </content>
+      <extensionPointId>
         <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>contentType</name>
-        <number>6</number>
-        <prettyName>Content Type</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
+        <name>extensionPointId</name>
+        <number>5</number>
+        <prettyName>Extension Point ID</prettyName>
+        <size>30</size>
         <unmodifiable>0</unmodifiable>
-        <values>CSS|LESS</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </contentType>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </extensionPointId>
       <name>
         <disabled>0</disabled>
         <name>name</name>
-        <number>1</number>
-        <prettyName>Name</prettyName>
+        <number>6</number>
+        <prettyName>Extension ID</prettyName>
         <size>30</size>
         <unmodifiable>0</unmodifiable>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
-      <parse>
+      <parameters>
+        <contenttype>PureText</contenttype>
         <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>yesno</displayType>
-        <name>parse</name>
-        <number>4</number>
-        <prettyName>Parse content</prettyName>
+        <editor>PureText</editor>
+        <name>parameters</name>
+        <number>7</number>
+        <prettyName>Extension Parameters</prettyName>
+        <restricted>0</restricted>
+        <rows>10</rows>
+        <size>40</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </parse>
-      <use>
+        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+      </parameters>
+      <scope>
         <cache>0</cache>
         <disabled>0</disabled>
         <displayType>select</displayType>
         <freeText>forbidden</freeText>
         <largeStorage>0</largeStorage>
         <multiSelect>0</multiSelect>
-        <name>use</name>
-        <number>3</number>
-        <prettyName>Use this extension</prettyName>
+        <name>scope</name>
+        <number>8</number>
+        <prettyName>Extension Scope</prettyName>
         <relationalStorage>0</relationalStorage>
         <separator> </separator>
         <separators>|, </separators>
         <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <values>currentPage|onDemand|always</values>
+        <values>wiki=Current Wiki|user=Current User|global=Global</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </use>
+      </scope>
     </class>
     <property>
-      <cache>long</cache>
+      <async_cached>0</async_cached>
+    </property>
+    <property>
+      <async_context/>
     </property>
     <property>
-      <code>#notificationSystemFilterPreferencesLiveTable select.pagesizeselect {
-  width: auto;
-}</code>
+      <async_enabled>0</async_enabled>
     </property>
     <property>
-      <contentType>CSS</contentType>
+      <content/>
     </property>
     <property>
-      <name>NotificationFilterPreferences</name>
+      <extensionPointId>org.xwiki.platform.requirejs.module</extensionPointId>
     </property>
     <property>
-      <parse/>
+      <name>org.xwiki.notifications.requirejs.module</name>
     </property>
     <property>
-      <use>currentPage</use>
+      <parameters>id=xwiki-platform-notifications-webjar
+path=$services.webjars.url('org.xwiki.platform:xwiki-platform-notifications-webjar', 'main.umd')</parameters>
+    </property>
+    <property>
+      <scope>wiki</scope>
     </property>
   </object>
   <object>
@@ -660,7 +390,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <separators>|, </separators>
         <size>5</size>
         <unmodifiable>0</unmodifiable>
-        <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -680,6 +410,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <name>code</name>
         <number>10</number>
         <prettyName>Macro code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -692,6 +423,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <name>contentDescription</name>
         <number>9</number>
         <prettyName>Content description (Not applicable for "No content" type)</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -760,6 +492,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <name>description</name>
         <number>3</number>
         <prettyName>Macro description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -851,7 +584,6 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
 ### CSS and JAVASCRIPTS
 ######################################################
 #set ($discard = $xwiki.jsx.use('XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro'))
-#set ($discard = $xwiki.ssx.use('XWiki.Notifications.Code.NotificationsSystemFiltersPreferencesMacro'))
 ## TODO: replace by $xwiki.sswx.use() or something like this when XWIKI-12788 is closed.
 #set ($discard = $xwiki.linkx.use($services.webjars.url('bootstrap-switch', 'css/bootstrap3/bootstrap-switch.min.css'), {'type': 'text/css', 'rel': 'stylesheet'}))
 ######################################################
@@ -864,29 +596,44 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
       $escapetool.xml($services.localization.render('notifications.settings.filters.preferences.system.hint'))
     &lt;/p&gt;
   &lt;/div&gt;
-  #set($collist  = ['name', 'filterType', 'notificationFormats', 'isEnabled'])
-  #set($colprops = {
-    'name':                { 'sortable': false, 'html': true, 'filterable': false },
-    'filterType':          { 'sortable': false, 'filterable': false },
-    'notificationFormats': { 'sortable': false, 'html': true, 'filterable': false },
-    'isEnabled':           { 'sortable': false, 'html' : true, 'filterable': false }
-  })
-  #set ($extraParams = "eventType=&amp;format=&amp;type=system")
-  #if ($wikimacro.parameters.target == 'user')
-    #set ($extraParams = "$extraParams&amp;user=${services.model.serialize($targetUser, 'default')}")
-  #end
-  #set($options  = {
-    'resultPage'        : 'XWiki.Notifications.Code.NotificationFilterPreferenceLivetableResults',
-    'rowCount'          : 10,
-    'description'       : 'This table lists every system filter registered in the wiki.',
-    'translationPrefix' : 'notifications.settings.filters.preferences.system.table.',
-    'extraParams'       : $extraParams,
-    'outputOnlyHtml'    : true
-  })
-
-  #livetable("notificationSystemFilterPreferencesLiveTable" $collist $colprops $options)
 &lt;/div&gt;
 {{/html}}
+#set ($sourceParameters = {
+  'translationPrefix': 'notifications.settings.filters.preferences.system.table.',
+  'resultPage': 'XWiki.Notifications.Code.NotificationFilterPreferenceLivetableResults',
+  'eventType': '',
+  'format': '',
+  'type': 'system'
+})
+#if ($wikimacro.parameters.target == 'user')
+#set($discard = $sourceParameters.put('user', $services.model.serialize($targetUser, 'default')))
+#end
+
+#set ($liveDataConfig = {
+  'meta': {
+    'propertyDescriptors': [
+      { 'id': 'notificationFormats', 'displayer': 'html', 'filterable': false, 'sortable': false },
+      { 'id': 'isEnabled', 'displayer': 'toggle', 'filterable': false, 'sortable': false },
+      { 'id': 'name', 'filterable': false, 'sortable': false},
+      { 'id': 'filterType', 'filterable': false, 'sortable': false}
+    ],
+    'entryDescriptor': {
+        'idProperty': 'filterPreferenceId'
+    }
+  }
+})
+#set ($description = 
+    $services.localization.render('notifications.settings.filters.preferences.system.table.description'))
+#set ($description = $services.rendering.escape($description, 'xwiki/2.1'))
+#set ($sourceParameters = $services.rendering.escape($escapetool.url($sourceParameters), 'xwiki/2.1'))
+{{liveData
+  id='notificationSystemFilterPreferencesLiveData'
+  properties="name,filterType,notificationFormats,isEnabled"
+  source='liveTable'
+  sourceParameters="$sourceParameters"
+  limit='10'
+  description="$description"
+}}$jsontool.serialize($liveDataConfig){{/liveData}}
 #end
 {{/velocity}}</code>
     </property>
@@ -951,6 +698,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -976,13 +724,24 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -1029,6 +788,7 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -1054,13 +814,24 @@ require(['jquery', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
index ce4b346d63fe..b0198919b881 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
@@ -97,6 +97,7 @@ notifications.settings.filters.preferences.system.table.name=Name
 notifications.settings.filters.preferences.system.table.filterType=Description
 notifications.settings.filters.preferences.system.table.notificationFormats=Formats
 notifications.settings.filters.preferences.system.table.isEnabled=Is enabled?
+notifications.settings.filters.preferences.system.table.description=This table lists every system filter registered in the wiki.
 
 ## Custom Filter preferences settings
 notifications.settings.filters.preferences.custom.title=Custom Filters
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
new file mode 100644
index 000000000000..885b4bcb7d1c
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.xwiki.platform</groupId>
+    <artifactId>xwiki-platform-notifications</artifactId>
+    <version>16.1.0-SNAPSHOT</version>
+  </parent>
+  <packaging>webjar</packaging>
+  <artifactId>xwiki-platform-notifications-webjar</artifactId>
+  <name>XWiki Platform - Notifications - WebJar</name>
+  <properties>
+    <!-- Name to display by the Extension Manager -->
+    <xwiki.extension.name>Notifications WebJar</xwiki.extension.name>
+    <!-- Vite is already taking care of minification and bundling in an efficient way. -->
+    <xwiki.minification.skip>true</xwiki.minification.skip>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.webjars.npm</groupId>
+      <artifactId>vue</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-livedata-webjar</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.webjars</groupId>
+      <artifactId>jquery</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.webjars</groupId>
+      <artifactId>bootstrap-switch</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-vue-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/vue</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/vue</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <!-- Copy the generated Vue components to the WebJar folder. -->
+            <id>copy-vue-components</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/vue/dist</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Skip jsHint because we use ESLint through the frontend-maven-plugin -->
+      <plugin>
+        <groupId>org.xwiki.contrib</groupId>
+        <artifactId>jshint-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-lint</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-node-and-npm</id>
+            <goals>
+              <goal>install-node-and-npm</goal>
+            </goals>
+            <configuration>
+              <nodeVersion>v20.11.0</nodeVersion>
+              <npmVersion>10.3.0</npmVersion>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm-install</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>ci</arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm-run-build</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run build</arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm-run-lint</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run lint</arguments>
+            </configuration>
+            <phase>test</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <workingDirectory>${project.build.directory}/vue</workingDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.eslintrc.cjs b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.eslintrc.cjs
new file mode 100644
index 000000000000..49326a276737
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.eslintrc.cjs
@@ -0,0 +1,12 @@
+/* eslint-env node */
+require("@rushstack/eslint-patch/modern-module-resolution");
+
+module.exports = {
+  "root": true,
+  "extends": [
+    "plugin:vue/essential",
+    "eslint:recommended",
+    "@vue/eslint-config-prettier"
+  ],
+  "ignorePatterns": ["vite.config.js"]
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.gitignore b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.gitignore
new file mode 100644
index 000000000000..133da84efcfe
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/.gitignore
@@ -0,0 +1,27 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+
+# Editor directories and files
+.vscode
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package-lock.json b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package-lock.json
new file mode 100644
index 000000000000..864af5a0fb64
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package-lock.json
@@ -0,0 +1,3450 @@
+{
+  "name": "xwiki-platform-notifications-webjar",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "xwiki-platform-notifications-webjar",
+      "version": "0.0.0",
+      "dependencies": {
+        "vue": "2.7.16"
+      },
+      "devDependencies": {
+        "@rushstack/eslint-patch": "1.7.2",
+        "@vitejs/plugin-vue2": "1.1.2",
+        "@vue/eslint-config-prettier": "7.1.0",
+        "@vue/test-utils": "1.3.6",
+        "eslint": "8.56.0",
+        "eslint-plugin-vue": "9.20.1",
+        "jquery": "3.7.1",
+        "jsdom": "20.0.3",
+        "prettier": "2.8.8",
+        "terser": "5.27.0",
+        "vite": "3.2.8",
+        "vitest": "0.18.1",
+        "vue-template-compiler": "2.7.16"
+      }
+    },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
+      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
+      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@one-ini/wasm": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+      "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+      "dev": true
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@rushstack/eslint-patch": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz",
+      "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==",
+      "dev": true
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/chai": {
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
+      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
+      "dev": true
+    },
+    "node_modules/@types/chai-subset": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
+      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
+      "dev": true,
+      "dependencies": {
+        "@types/chai": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz",
+      "integrity": "sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/@vitejs/plugin-vue2": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-1.1.2.tgz",
+      "integrity": "sha512-y6OEA+2UdJ0xrEQHodq20v9r3SpS62IOHrgN92JPLvVpNkhcissu7yvD5PXMzMESyazj0XNWGsc8UQk8+mVrjQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "peerDependencies": {
+        "vite": ">=2.5.10",
+        "vue": "^2.7.0-0"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+      "dependencies": {
+        "@babel/parser": "^7.23.5",
+        "postcss": "^8.4.14",
+        "source-map": "^0.6.1"
+      },
+      "optionalDependencies": {
+        "prettier": "^1.18.2 || ^2.0.0"
+      }
+    },
+    "node_modules/@vue/eslint-config-prettier": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz",
+      "integrity": "sha512-Pv/lVr0bAzSIHLd9iz0KnvAr4GKyCEl+h52bc4e5yWuDVtLgFwycF7nrbWTAQAS+FU6q1geVd07lc6EWfJiWKQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-prettier": "^4.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">= 7.28.0",
+        "prettier": ">= 2.0.0"
+      }
+    },
+    "node_modules/@vue/test-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.6.tgz",
+      "integrity": "sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==",
+      "dev": true,
+      "dependencies": {
+        "dom-event-types": "^1.0.0",
+        "lodash": "^4.17.15",
+        "pretty": "^2.0.0"
+      },
+      "peerDependencies": {
+        "vue": "2.x",
+        "vue-template-compiler": "^2.x"
+      }
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/condense-newlines": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
+      "integrity": "sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-whitespace": "^0.3.0",
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/de-indent": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-event-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
+      "integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
+      "dev": true
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/editorconfig": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+      "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
+      "dev": true,
+      "dependencies": {
+        "@one-ini/wasm": "0.1.1",
+        "commander": "^10.0.0",
+        "minimatch": "9.0.1",
+        "semver": "^7.5.3"
+      },
+      "bin": {
+        "editorconfig": "bin/editorconfig"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/editorconfig/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/editorconfig/node_modules/minimatch": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.56.0",
+        "@humanwhocodes/config-array": "^0.11.13",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-vue": {
+      "version": "9.20.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.20.1.tgz",
+      "integrity": "sha512-GyCs8K3lkEvoyC1VV97GJhP1SvqsKCiWGHnbn0gVUYiUhaH2+nB+Dv1uekv1THFMPbBfYxukrzQdltw950k+LQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "natural-compare": "^1.4.0",
+        "nth-check": "^2.1.1",
+        "postcss-selector-parser": "^6.0.13",
+        "semver": "^7.5.4",
+        "vue-eslint-parser": "^9.4.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
+      "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "dev": true
+    },
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-whitespace": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
+      "integrity": "sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+      "dev": true
+    },
+    "node_modules/js-beautify": {
+      "version": "1.14.11",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz",
+      "integrity": "sha512-rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw==",
+      "dev": true,
+      "dependencies": {
+        "config-chain": "^1.1.13",
+        "editorconfig": "^1.0.3",
+        "glob": "^10.3.3",
+        "nopt": "^7.2.0"
+      },
+      "bin": {
+        "css-beautify": "js/bin/css-beautify.js",
+        "html-beautify": "js/bin/html-beautify.js",
+        "js-beautify": "js/bin/js-beautify.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.1"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/nopt": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz",
+      "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^2.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+      "dev": true
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-scurry": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/postcss": {
+      "version": "8.4.33",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.15",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
+      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "devOptional": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/pretty": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
+      "integrity": "sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==",
+      "dev": true,
+      "dependencies": {
+        "condense-newlines": "^0.2.1",
+        "extend-shallow": "^2.0.1",
+        "js-beautify": "^1.6.12"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/terser": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz",
+      "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/tinypool": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.2.4.tgz",
+      "integrity": "sha512-Vs3rhkUH6Qq1t5bqtb816oT+HeJTXfwt2cbPH17sWHIYKTotQIFPk3tf2fgqRrVyMDVOc1EnPgzIxfIulXVzwQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-1.1.1.tgz",
+      "integrity": "sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/vite": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.8.tgz",
+      "integrity": "sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.15.9",
+        "postcss": "^8.4.18",
+        "resolve": "^1.22.1",
+        "rollup": "^2.79.1"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      },
+      "peerDependencies": {
+        "@types/node": ">= 14",
+        "less": "*",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.18.1.tgz",
+      "integrity": "sha512-4F/1K/Vn4AvJwe7i2YblR02PT5vMKcw9KN4unDq2KD0YcSxX0B/6D6Qu9PJaXwVuxXMFTQ5ovd4+CQaW3bwofA==",
+      "dev": true,
+      "dependencies": {
+        "@types/chai": "^4.3.1",
+        "@types/chai-subset": "^1.3.3",
+        "@types/node": "*",
+        "chai": "^4.3.6",
+        "debug": "^4.3.4",
+        "local-pkg": "^0.4.2",
+        "tinypool": "^0.2.4",
+        "tinyspy": "^1.0.0",
+        "vite": "^2.9.12 || ^3.0.0-0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": ">=v14.16.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@vitest/ui": "*",
+        "c8": "*",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "c8": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue": {
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+      "dependencies": {
+        "@vue/compiler-sfc": "2.7.16",
+        "csstype": "^3.1.0"
+      }
+    },
+    "node_modules/vue-eslint-parser": {
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz",
+      "integrity": "sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "eslint-scope": "^7.1.1",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "lodash": "^4.17.21",
+        "semver": "^7.3.6"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/vue-template-compiler": {
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
+      "dev": true,
+      "dependencies": {
+        "de-indent": "^1.0.2",
+        "he": "^1.2.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/ws": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package.json b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package.json
new file mode 100644
index 000000000000..555a44689e78
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "xwiki-platform-notifications-webjar",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "build": "vite build",
+    "test": "vitest --environment jsdom --run",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --no-fix --ignore-path .gitignore"
+  },
+  "dependencies": {
+    "vue": "2.7.16"
+  },
+  "devDependencies": {
+    "@rushstack/eslint-patch": "1.7.2",
+    "@vitejs/plugin-vue2": "1.1.2",
+    "@vue/eslint-config-prettier": "7.1.0",
+    "@vue/test-utils": "1.3.6",
+    "eslint": "8.56.0",
+    "eslint-plugin-vue": "9.20.1",
+    "jsdom": "20.0.3",
+    "prettier": "2.8.8",
+    "terser": "5.27.0",
+    "vite": "3.2.8",
+    "vitest": "0.18.1",
+    "vue-template-compiler": "2.7.16",
+    "jquery": "3.7.1"
+  }
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/components/DisplayerToggle.vue b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/components/DisplayerToggle.vue
new file mode 100644
index 000000000000..57dbef371edd
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/components/DisplayerToggle.vue
@@ -0,0 +1,134 @@
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!--
+  DisplayerToggle is a special custom displayer that displays a toggle element supported by bootstrap-switch.
+  It is sending a "xwiki:livedata:toggle" even on state change, to be listened for by external scripts.
+-->
+<template>
+  <!--
+    Uses the BaseDisplayer as root element, as it handles for us all the displayer default behavior.
+  -->
+  <BaseDisplayer
+      class="displayer-toggle"
+      view-only
+      :property-id="propertyId"
+      :entry="entry"
+      :is-empty="false"
+      :intercept-touch="false"
+  >
+    <template #viewer>
+      <input
+          type='checkbox'
+          class='toggleableFilterPreferenceCheckbox'
+          ref="input"
+      />
+      <!-- We keep this section hidden as it is only there to be copied when initializing the toggle. -->
+      <span v-show="false">
+        <XWikiIcon
+            :icon-descriptor="{name: iconName}"
+            ref="icon"
+            @ready="iconReady = true"
+        />
+      </span>
+    </template>
+
+    <!--
+      The Toggle displayer does not have an Editor widget. Therefore, we leave the editor template empty.
+      Moreover, we add the `view-only` property on the BaseDisplayer component so that user can't possibly switch 
+      to the Editor widget.
+    -->
+    <template #editor></template>
+  </BaseDisplayer>
+</template>
+
+<script>
+import {displayerMixin, BaseDisplayer, XWikiIcon} from "xwiki-livedata-vue";
+import $ from "jquery";
+
+export default {
+  name: "displayer-toggle",
+  components: {BaseDisplayer, XWikiIcon},
+  // Add the displayerMixin to get access to all the displayers methods and computed properties inside this component.
+  mixins: [displayerMixin],
+  props: {
+    iconName: {
+      type: String,
+      default: 'bell'
+    }
+  },
+  data() {
+    return {
+      // When this value changes to true following the ready from XWikiIcon, the toggle is initialized.
+      iconReady: false,
+      innerChecked: this.entry[`${this.propertyId}_checked`],
+      innerDisabled: this.entry[`${this.propertyId}_disabled`],
+      innerData: {
+        ... this.entry[`${this.propertyId}_data`]
+      }
+    }
+  },
+  watch: {
+    iconReady: function (val) {
+      if (val) {
+        const component = this;
+        // Wait for the icon component to be fully rendered before copying its content.
+        this.$nextTick(() => {
+          $(this.$refs.input).bootstrapSwitch({
+            size: 'mini',
+            state: component.innerChecked,
+            disabled: component.innerDisabled,
+            labelText: this.$refs.icon.$el.outerHTML,
+            /*
+             Send a xwiki:livedata:toggle event with the following event data:
+             - the data of the toggle
+             - the new state of the toggle
+             - the disabled status of the toggle
+             - a callback. When the callback is called, the toggle component is updated with the provided data, state, 
+                and disabled status. 
+            */
+            onSwitchChange(event, state) {
+              const toggleData = component.innerData;
+              const disabledVal = component.innerDisabled;
+              component.logic.triggerEvent("toggle", {
+                data: toggleData,
+                checked: state,
+                disabled: disabledVal,
+                callback: function ({
+                  data = toggleData,
+                  checked = state,
+                  disabled = disabledVal
+                }) {
+                  component.innerData = data;
+                  component.innerChecked = checked;
+                  component.innerDisabled = disabled;
+                  // The last parameter is skip, preventing to call onSwitchChange again.
+                  $(component.$refs.input).bootstrapSwitch('state', checked, true);
+                  $(component.$refs.input).bootstrapSwitch('disabled', disabled);
+                }
+              })
+            }
+          })
+        })
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/main.js b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/main.js
new file mode 100644
index 000000000000..fc8ddcb896a3
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/src/main.js
@@ -0,0 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+import DisplayerToggle from "./components/DisplayerToggle.vue";
+
+// Export the elements that are expected to be imported from other modules.
+export {DisplayerToggle}
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/vite.config.js b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/vite.config.js
new file mode 100644
index 000000000000..6a8d277c696c
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/vue/vite.config.js
@@ -0,0 +1,47 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import {defineConfig} from 'vite'
+import vue2 from '@vitejs/plugin-vue2'
+import {resolve} from 'path'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue2()],
+  build: {
+    lib: {
+      entry: resolve(__dirname, "src/main.js"),
+      fileName: "main",
+      name: 'xwiki-platform-notifications-webjar',
+      formats: ['umd']
+    },
+    rollupOptions: {
+      // make sure to externalize deps that shouldn't be bundled into your library
+      external: ["vue", "jquery", "xwiki-livedata-vue"],
+      output: {
+        // Provide global variables to use in the UMD build for externalized deps
+        globals: {
+          vue: "Vue",
+          jquery: "$"
+        },
+      },
+    },
+  },
+});

From 33367db33adb94fac1baf2c51a8ce9a439b53b78 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Tue, 6 Feb 2024 10:40:32 +0100
Subject: [PATCH 100/143] XWIKI-19041: Replace the Livetable from
 DocumentsMacro with a Live Data macro

* Fix the default sorting computation
---
 .../src/main/resources/XWiki/DocumentsMacro.xml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
index ef9e0c544e52..51baddcd0f68 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml
@@ -306,10 +306,10 @@ Generates:
 #if ("$!xcontext.macro.params.count" != '')
   #set ($limit = $services.rendering.escape($xcontext.macro.params.count, 'xwiki/2.1'))
 #end
-#set ($properties = $services.rendering.escape($stringtool.join($properties, ','), 'xwiki/2.1'))
+#set ($propertiesStr = $services.rendering.escape($stringtool.join($properties, ','), 'xwiki/2.1'))
 {{liveData
   id="$livedataId"
-  properties="$properties"
+  properties="$propertiesStr"
   source="liveTable"
   sourceParameters="$escapetool.url($sourceParameters)"
   #if ($description != '')description="$description"#end

From bb4259a1080a4aef25bcb6886a2369867a922e3c Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Tue, 6 Feb 2024 15:43:05 +0100
Subject: [PATCH 101/143] XWIKI-18998: Replace the Livetable of the System
 Filters of the Notifications Administration with a Live Data macro

Revert code included by accident.
---
 .../pom.xml                                   |   6 +-
 ...FilterPreferenceConfigurationResolver.java |  61 -----
 ...otificationFilterPreferenceEntryStore.java | 245 ------------------
 ...icationFilterPreferenceLiveDataSource.java |  64 -----
 ...lterPreferencePropertyDescriptorStore.java | 118 ---------
 .../main/resources/META-INF/components.txt    |   4 -
 6 files changed, 1 insertion(+), 497 deletions(-)
 delete mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
 delete mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
 delete mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
 delete mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
index 8c8ca4df868e..01b5b12399b0 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
@@ -45,11 +45,7 @@
       <artifactId>xwiki-platform-oldcore</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-livedata-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.xwiki.commons</groupId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
deleted file mode 100644
index 84d2ac43958c..000000000000
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceConfigurationResolver.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.notifications.filters.internal.livedata;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.xwiki.component.annotation.Component;
-import org.xwiki.livedata.LiveDataConfiguration;
-import org.xwiki.livedata.LiveDataConfigurationResolver;
-import org.xwiki.livedata.LiveDataEntryDescriptor;
-import org.xwiki.livedata.LiveDataException;
-import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
-import org.xwiki.livedata.internal.JSONMerge;
-
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE;
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.FILTER_PREFERENCE_ID;
-
-/**
- * @version $Id$
- * @since 16.1.0RC1
- */
-@Component
-@Named(NOTIFICATION_FILTER_PREFERENCE)
-@Singleton
-public class NotificationFilterPreferenceConfigurationResolver
-    implements LiveDataConfigurationResolver<LiveDataConfiguration>
-{
-    @Inject
-    @Named(NOTIFICATION_FILTER_PREFERENCE)
-    private LiveDataPropertyDescriptorStore liveDataPropertyDescriptorStore;
-
-    @Override
-    public LiveDataConfiguration resolve(LiveDataConfiguration input) throws LiveDataException
-    {
-        LiveDataConfiguration liveDataConfiguration = new LiveDataConfiguration();
-        liveDataConfiguration.getMeta().setPropertyDescriptors(this.liveDataPropertyDescriptorStore.get());
-        LiveDataEntryDescriptor entryDescriptor = new LiveDataEntryDescriptor();
-        entryDescriptor.setIdProperty(FILTER_PREFERENCE_ID);
-        liveDataConfiguration.getMeta().setEntryDescriptor(entryDescriptor);
-        return new JSONMerge().merge(input, liveDataConfiguration);
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
deleted file mode 100644
index 0366710bf25a..000000000000
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceEntryStore.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.notifications.filters.internal.livedata;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.xwiki.component.annotation.Component;
-import org.xwiki.livedata.LiveData;
-import org.xwiki.livedata.LiveDataEntryStore;
-import org.xwiki.livedata.LiveDataException;
-import org.xwiki.livedata.LiveDataQuery;
-import org.xwiki.localization.ContextualLocalizationManager;
-import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.model.reference.DocumentReferenceResolver;
-import org.xwiki.model.reference.LocalDocumentReference;
-import org.xwiki.model.reference.WikiReference;
-import org.xwiki.notifications.NotificationException;
-import org.xwiki.notifications.filters.NotificationFilter;
-import org.xwiki.notifications.filters.NotificationFilterManager;
-import org.xwiki.notifications.filters.NotificationFilterPreference;
-import org.xwiki.notifications.filters.NotificationFilterPreferenceManager;
-import org.xwiki.notifications.filters.internal.ToggleableNotificationFilter;
-import org.xwiki.security.authorization.ContextualAuthorizationManager;
-import org.xwiki.security.authorization.Right;
-
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.doc.XWikiDocument;
-import com.xpn.xwiki.objects.BaseObject;
-
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE;
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.FILTER_PREFERENCE_ID;
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.ID_PROPERTY;
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.IS_ENABLED_PROPERTY;
-import static org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore.NAME_PROPERTY;
-
-/**
- * @version $Id$
- * @since 16.1.0RC1
- */
-@Component
-@Named(NOTIFICATION_FILTER_PREFERENCE)
-@Singleton
-public class NotificationFilterPreferenceEntryStore implements LiveDataEntryStore
-{
-    private static final String USER_SOURCE_PARAM = "user";
-
-    @Inject
-    private DocumentReferenceResolver<String> entityReferenceResolver;
-
-    @Inject
-    private ContextualAuthorizationManager contextualAuthorizationManager;
-
-    @Inject
-    private NotificationFilterPreferenceManager notificationFilterPreferenceManager;
-
-    @Inject
-    private Provider<XWikiContext> xWikiContextProvider;
-
-    @Inject
-    private NotificationFilterManager notificationFilterManager;
-
-    @Inject
-    private ContextualLocalizationManager l10n;
-
-    @Override
-    public Optional<Map<String, Object>> get(Object entryId) throws LiveDataException
-    {
-        return Optional.empty();
-    }
-
-    @Override
-    public LiveData get(LiveDataQuery query) throws LiveDataException
-    {
-        // TODO port the select logic here
-        Map<String, Object> sourceParameters = query.getSource().getParameters();
-
-        boolean isAccessGranted = true;
-        DocumentReference requestedUserDocRef = null;
-        XWikiContext xWikiContext = this.xWikiContextProvider.get();
-        WikiReference wikiReference = null;
-        String user = (String) sourceParameters.getOrDefault(USER_SOURCE_PARAM, "");
-        XWikiDocument document;
-        try {
-            if (!user.isEmpty()) {
-                requestedUserDocRef = this.entityReferenceResolver.resolve(user);
-                isAccessGranted = this.contextualAuthorizationManager.hasAccess(Right.ADMIN, requestedUserDocRef)
-                    || xWikiContext.getUserReference().equals(requestedUserDocRef);
-                document = xWikiContext.getWiki().getDocument(requestedUserDocRef, xWikiContext);
-            } else {
-                wikiReference = xWikiContext.getWikiReference();
-                document = xWikiContext.getWiki().getDocument(
-                    new LocalDocumentReference(List.of("XWiki", "Notifications", "Code"), "NotificationAdministration"),
-                    xWikiContext);
-            }
-        } catch (XWikiException e) {
-            // TODO: improve message
-            throw new LiveDataException("Failed to access document...", e);
-        }
-
-        if (!isAccessGranted) {
-            // TODO: improve error message.
-            throw new LiveDataException("Access not allowed");
-        }
-
-        Object type = sourceParameters.getOrDefault("type", "");
-        boolean displaySystem = true;
-        boolean displayCustom = true;
-        if (type.equals("custom")) {
-            displaySystem = false;
-        } else if (type.equals("system")) {
-            displayCustom = false;
-        }
-
-        long index = 0;
-        Long offset = query.getOffset();
-        long limitOffset = offset + query.getLimit();
-
-        List<Map<String, Object>> entries = new ArrayList<>();
-        if (displaySystem) {
-            Set<NotificationFilter> systemFilters = getSystemFilters(requestedUserDocRef, wikiReference);
-            for (NotificationFilter filter : systemFilters) {
-                index += 1;
-                if (isInRange(index, offset, limitOffset)) {
-                    boolean isEnabled = filter instanceof ToggleableNotificationFilter
-                        && ((ToggleableNotificationFilter) filter).isEnabledByDefault();
-                    String objectNumber = "";
-                    BaseObject obj =
-                        document.getXObject(new LocalDocumentReference(List.of("XWiki", "Notifications", "Code"),
-                            "ToggleableFilterPreferenceClass"));
-                    if (obj != null) {
-                        isEnabled = obj.getIntValue("isEnabled") != 0;
-                        objectNumber = String.valueOf(obj.getNumber());
-                    }
-
-                    entries.add(buildEntry(filter, isEnabled, objectNumber));
-                }
-            }
-        }
-
-        // Continue with the display custom fields only 
-        if (displayCustom && isInRange(index, offset, limitOffset)) {
-
-        }
-
-        LiveData liveData = new LiveData();
-        // TODO: define count...
-        liveData.setCount(0);
-//        entries.sort(Comparator.comparing(o -> ((String) o.getOrDefault("name", ""))));
-        liveData.getEntries().addAll(entries);
-        return liveData;
-    }
-
-    private static boolean isInRange(long index, Long offset, long limitOffset)
-    {
-        return index > offset && index <= limitOffset;
-    }
-
-    private Map<String, Object> buildEntry(NotificationFilter systemFilter, boolean isEnabled,
-        String objectNumber)
-    {
-        String name = this.l10n.getTranslationPlain(
-            "notifications.filters.name.%s".formatted(systemFilter.getName()));
-        Map<String, Object> entry = Map.of(
-            FILTER_PREFERENCE_ID, name,
-            NAME_PROPERTY, name,
-            ID_PROPERTY, "notificationFormats",
-            "%s_checked".formatted(IS_ENABLED_PROPERTY), isEnabled,
-            "%s_data".formatted(IS_ENABLED_PROPERTY), Map.of(
-                "objectNumber", objectNumber,
-                "filterName", systemFilter.getName()
-            )
-        );
-        return entry;
-    }
-
-    private List<NotificationFilter> getSystemFilters(DocumentReference requestedUserDocRef,
-        WikiReference wikiReference)
-        throws LiveDataException
-    {
-        try {
-            Collection<NotificationFilter> notificationFilters;
-            if (requestedUserDocRef != null) {
-                notificationFilters = this.notificationFilterManager.getAllFilters(requestedUserDocRef, false);
-            } else {
-                notificationFilters = this.notificationFilterManager.getAllFilters(wikiReference);
-            }
-            return this.notificationFilterManager.getToggleableFilters(notificationFilters)
-                .sorted(Comparator.comparing(NotificationFilter::getName))
-                .toList();
-        } catch (NotificationException e) {
-            throw new LiveDataException("Failed to get system filters", e);
-        }
-    }
-
-    private List<NotificationFilterPreference> getCustomFilters(DocumentReference requestedUserDocRef,
-        WikiReference wikiReference, NotificationFilter filter)
-        throws LiveDataException
-    {
-        // TODO: that's the second step, the fist one is to get the first list of filters
-        // ALso, need to re-read the velocity code to check that the parameters is correctly used.
-        try {
-            Collection<NotificationFilterPreference> notificationFilters;
-            if (requestedUserDocRef != null) {
-                notificationFilters =
-                    this.notificationFilterPreferenceManager.getFilterPreferences(requestedUserDocRef);
-            } else {
-                notificationFilters = this.notificationFilterPreferenceManager.getFilterPreferences(wikiReference);
-            }
-            return this.notificationFilterPreferenceManager.getFilterPreferences(notificationFilters, filter)
-                .sorted(Comparator.comparing(NotificationFilterPreference::getId))
-                .toList();
-        } catch (NotificationException e) {
-            throw new LiveDataException("Failed to get custom filters", e);
-        }
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
deleted file mode 100644
index d1e6344b8387..000000000000
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferenceLiveDataSource.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.notifications.filters.internal.livedata;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.xwiki.component.annotation.Component;
-import org.xwiki.livedata.LiveDataEntryStore;
-import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
-import org.xwiki.livedata.LiveDataSource;
-
-/**
- * @version $Id$
- * @since 16.1.0RC1
- */
-@Component
-@Named(NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE)
-@Singleton
-public class NotificationFilterPreferenceLiveDataSource implements LiveDataSource
-{
-    /**
-     * This component hint.
-     */
-    public static final String NOTIFICATION_FILTER_PREFERENCE = "notificationFilterPreference";
-
-    @Inject
-    @Named(NOTIFICATION_FILTER_PREFERENCE)
-    private LiveDataEntryStore entryStore;
-
-    @Inject
-    @Named(NOTIFICATION_FILTER_PREFERENCE)
-    private LiveDataPropertyDescriptorStore propertyDescriptorStore;
-
-    @Override
-    public LiveDataEntryStore getEntries()
-    {
-        return this.entryStore;
-    }
-
-    @Override
-    public LiveDataPropertyDescriptorStore getProperties()
-    {
-        return this.propertyDescriptorStore;
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java
deleted file mode 100644
index 75586edb0276..000000000000
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/NotificationFilterPreferencePropertyDescriptorStore.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.notifications.filters.internal.livedata;
-
-import java.util.Collection;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.xwiki.component.annotation.Component;
-import org.xwiki.livedata.LiveDataException;
-import org.xwiki.livedata.LiveDataPropertyDescriptor;
-import org.xwiki.livedata.LiveDataPropertyDescriptor.DisplayerDescriptor;
-import org.xwiki.livedata.LiveDataPropertyDescriptorStore;
-import org.xwiki.localization.ContextualLocalizationManager;
-
-/**
- * @version $Id$
- * @since 16.1.0RC1
- */
-@Component
-@Named(NotificationFilterPreferenceLiveDataSource.NOTIFICATION_FILTER_PREFERENCE)
-@Singleton
-public class NotificationFilterPreferencePropertyDescriptorStore implements LiveDataPropertyDescriptorStore
-{
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String ID_PROPERTY = "notificationFormats";
-
-    public static final String FILTER_PREFERENCE_ID = "filterPreferenceId";
-
-    public static final String IS_ENABLED_PROPERTY = "isEnabled";
-
-    private static final String L10N_PREFIX = "notifications.settings.filters.preferences.system.table";
-
-    private static final String STRING_TYPE = "String";
-
-    private static final String HTML_DISPLAYER_ID = "html";
-
-    private static final String TOGGLE_DISPLAYER_ID = "toggle";
-
-    @Inject
-    private ContextualLocalizationManager l10n;
-
-    @Override
-    public Collection<LiveDataPropertyDescriptor> get() throws LiveDataException
-    {
-        return Set.of(
-            getName(),
-            getFilterType(),
-            getNotificationFormats(),
-            getIsEnabled()
-        );
-    }
-
-    private LiveDataPropertyDescriptor getFilterType()
-    {
-        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
-        String id = "filterType";
-        liveDataPropertyDescriptor.setId(id);
-        liveDataPropertyDescriptor.setName(getTranslationFromId(id));
-        liveDataPropertyDescriptor.setType(STRING_TYPE);
-        return liveDataPropertyDescriptor;
-    }
-
-    private LiveDataPropertyDescriptor getName()
-    {
-        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
-        liveDataPropertyDescriptor.setId(NAME_PROPERTY);
-        liveDataPropertyDescriptor.setName(getTranslationFromId(NAME_PROPERTY));
-        liveDataPropertyDescriptor.setType(STRING_TYPE);
-        return liveDataPropertyDescriptor;
-    }
-
-    private LiveDataPropertyDescriptor getIsEnabled()
-    {
-        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
-        liveDataPropertyDescriptor.setId(IS_ENABLED_PROPERTY);
-        liveDataPropertyDescriptor.setName(getTranslationFromId(IS_ENABLED_PROPERTY));
-        liveDataPropertyDescriptor.setType(STRING_TYPE);
-        liveDataPropertyDescriptor.setDisplayer(new DisplayerDescriptor(TOGGLE_DISPLAYER_ID));
-        return liveDataPropertyDescriptor;
-    }
-
-    private LiveDataPropertyDescriptor getNotificationFormats()
-    {
-        LiveDataPropertyDescriptor liveDataPropertyDescriptor = new LiveDataPropertyDescriptor();
-        liveDataPropertyDescriptor.setId(ID_PROPERTY);
-        liveDataPropertyDescriptor.setName(getTranslationFromId(ID_PROPERTY));
-        liveDataPropertyDescriptor.setType(STRING_TYPE);
-        liveDataPropertyDescriptor.setDisplayer(new DisplayerDescriptor(HTML_DISPLAYER_ID));
-        return liveDataPropertyDescriptor;
-    }
-
-    private String getTranslationFromId(String id)
-    {
-        return this.l10n.getTranslationPlain("%s.%s".formatted(L10N_PREFIX, id));
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
index a51fa16dbee3..ef6153436b28 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
@@ -15,7 +15,3 @@ org.xwiki.notifications.filters.migration.R140401000XWIKI15460DataMigration
 org.xwiki.notifications.filters.migration.R151002000XWIKI21448DataMigration
 org.xwiki.notifications.filters.migration.R160000000XWIKI17243DataMigration
 org.xwiki.notifications.filters.migration.WatchListObjectsRemovalTaskConsumer
-org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceConfigurationResolver
-org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceEntryStore
-org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferenceLiveDataSource
-org.xwiki.notifications.filters.internal.livedata.NotificationFilterPreferencePropertyDescriptorStore

From c64485cb595d3a93a511f19d5810bc9f0029775b Mon Sep 17 00:00:00 2001
From: Sereza7 <lucas.charpentier@imt-atlantique.net>
Date: Thu, 25 Jan 2024 13:16:15 +0100
Subject: [PATCH 102/143] XWIKI-21618: The wizard step-done icons are hard
 coded * Replaced the hard coded character with an icon from the iconTheme

---
 .../src/main/resources/AppWithinMinutes/WizardStep.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml
index a05207b004bb..732a44f8c1c0 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml
@@ -51,7 +51,7 @@
         &lt;li&gt;
           &lt;span class="btn btn-xs number$extraClassName"&gt;
             #if ($stepNumber &gt; $index)
-              &amp;${escapetool.h}10004;
+              $services.icon.renderHTML('check')
             #else
               $index
             #end

From 775866172d5c09a99e3614ccf3b9660ac2fb9b13 Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Tue, 6 Feb 2024 17:17:10 +0100
Subject: [PATCH 103/143] XWIKI-21600: Various close button modals do not use
 icons (#2821)

* Updated close buttons on the export modal
* Removed incorrect escaping from the location picker modal
---
 .../src/main/resources/flamingo/export_modal.vm               | 4 +++-
 .../src/main/resources/templates/locationPicker_macros.vm     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
index dbc11ac74cab..8bfef24a1f00 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
@@ -28,7 +28,9 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+            $services.icon.renderHTML('cross')
+          </button>
           <div class="modal-title" id="exportModalLabel">
             $services.icon.renderHTML('download')
             $escapetool.xml($services.localization.render('core.menu.export'))
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
index 4895cb54cd15..8373306f5a04 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
@@ -223,8 +223,8 @@
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal" title="Close">
+            $services.icon.renderHTML('cross')
           </button>
           <div class="modal-title">$services.localization.render('core.documentPicker.title')</div>
         </div>

From 9c9a32128673fec203275a3527e6caa8a5431477 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Wed, 7 Feb 2024 14:34:09 +0100
Subject: [PATCH 104/143] XWIKI-21856: EmailTemplateRenderer should become an
 API

  * Provide a dedicated api for EmailTemplateRenderer
  * Deprecate NotificationEmailRenderer#generateEmailSubject
---
 .../email/EmailTemplateRenderer.java          |  72 +++++++
 .../email/NotificationEmailRenderer.java      |   2 +
 .../checkstyle/checkstyle-suppressions.xml    |   1 +
 .../AbstractNotificationEmailRenderer.java    |   5 +-
 ...java => DefaultEmailTemplateRenderer.java} |  48 ++---
 .../email/WikiEmailNotificationRenderer.java  |   9 +-
 .../main/resources/META-INF/components.txt    |   2 +-
 .../DefaultNotificationEmailRendererTest.java | 197 ++++++++++++++++++
 8 files changed, 302 insertions(+), 34 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/EmailTemplateRenderer.java
 rename xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/{EmailTemplateRenderer.java => DefaultEmailTemplateRenderer.java} (87%)
 create mode 100644 xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/test/java/org/xwiki/notifications/notifiers/internal/email/DefaultNotificationEmailRendererTest.java

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/EmailTemplateRenderer.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/EmailTemplateRenderer.java
new file mode 100644
index 000000000000..a022e8a4af7a
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/EmailTemplateRenderer.java
@@ -0,0 +1,72 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.notifications.notifiers.email;
+
+import java.util.Map;
+
+import org.xwiki.component.annotation.Role;
+import org.xwiki.notifications.CompositeEvent;
+import org.xwiki.notifications.NotificationException;
+import org.xwiki.rendering.block.Block;
+import org.xwiki.rendering.syntax.Syntax;
+import org.xwiki.stability.Unstable;
+import org.xwiki.template.Template;
+
+/**
+ * Helper for rendering template for email notifications.
+ *
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@Role
+@Unstable
+public interface EmailTemplateRenderer
+{
+    /**
+     * Execute a template for email notification. Two bindings are provided by default: {@code event} is bound to the
+     * given {@link CompositeEvent} and {@code emailUser} is bound to the given userId.
+     *
+     * @param event composite event to render
+     * @param userId id of the user who will receive the email
+     * @param template the template to use
+     * @param syntax syntax of the template and of the output
+     * @param customBindings the custom bindings to use in the template
+     * @return the rendered template
+     * @throws NotificationException if something wrong happens
+     */
+    Block executeTemplate(CompositeEvent event, String userId, Template template, Syntax syntax,
+        Map<String, Object> customBindings) throws NotificationException;
+
+    /**
+     * Render a block to HTML syntax.
+     *
+     * @param block block to render
+     * @return the HTML rendered version of the block
+     */
+    String renderHTML(Block block);
+
+    /**
+     * Render a block to plain text syntax.
+     *
+     * @param block block to render
+     * @return the plain text rendered version of the block
+     */
+    String renderPlainText(Block block);
+}
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/NotificationEmailRenderer.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/NotificationEmailRenderer.java
index 9b0fbb81ba1a..a1affc9afaa4 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/NotificationEmailRenderer.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/email/NotificationEmailRenderer.java
@@ -56,6 +56,8 @@ public interface NotificationEmailRenderer
      * @return the plain text subject for the email
      * @throws NotificationException of error occurs
      * @since 9.10RC1
+     * @deprecated this method has never been used so implementing it has no meaning
      */
+    @Deprecated(since = "16.1.0RC1")
     String generateEmailSubject(CompositeEvent compositeEvent, String userId) throws NotificationException;
 }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/checkstyle/checkstyle-suppressions.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/checkstyle/checkstyle-suppressions.xml
index d8ef2b6a0069..b65e73ff975e 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/checkstyle/checkstyle-suppressions.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/checkstyle/checkstyle-suppressions.xml
@@ -28,4 +28,5 @@
   <suppress checks="ClassFanOutComplexity" files="UserEventManager.java"/>
   <suppress checks="ClassFanOutComplexity" files="UserEventDispatcher.java"/>
   <suppress checks="ClassFanOutComplexity" files="AbstractMimeMessageIterator.java"/>
+  <suppress checks="ClassFanOutComplexity" files="DefaultEmailTemplateRenderer.java"/>
 </suppressions>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/AbstractNotificationEmailRenderer.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/AbstractNotificationEmailRenderer.java
index 912ceb81ee2e..07c9ac1f3267 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/AbstractNotificationEmailRenderer.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/AbstractNotificationEmailRenderer.java
@@ -19,10 +19,13 @@
  */
 package org.xwiki.notifications.notifiers.internal.email;
 
+import java.util.Map;
+
 import javax.inject.Inject;
 
 import org.xwiki.notifications.CompositeEvent;
 import org.xwiki.notifications.NotificationException;
+import org.xwiki.notifications.notifiers.email.EmailTemplateRenderer;
 import org.xwiki.notifications.notifiers.email.NotificationEmailRenderer;
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.syntax.Syntax;
@@ -63,7 +66,7 @@ protected Block executeTemplate(CompositeEvent event, String userId, String temp
         if (template == null) {
             template = templateManager.getTemplate(String.format(templatePath, "default"));
         }
-        return emailTemplateRenderer.executeTemplate(event, userId, template, syntax);
+        return emailTemplateRenderer.executeTemplate(event, userId, template, syntax, Map.of());
     }
 
     protected String renderHTML(Block block)
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/EmailTemplateRenderer.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/DefaultEmailTemplateRenderer.java
similarity index 87%
rename from xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/EmailTemplateRenderer.java
rename to xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/DefaultEmailTemplateRenderer.java
index 4863efd0d571..87099ad42782 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/EmailTemplateRenderer.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/DefaultEmailTemplateRenderer.java
@@ -19,6 +19,8 @@
  */
 package org.xwiki.notifications.notifiers.internal.email;
 
+import java.util.Map;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
@@ -32,6 +34,7 @@
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.notifications.CompositeEvent;
 import org.xwiki.notifications.NotificationException;
+import org.xwiki.notifications.notifiers.email.EmailTemplateRenderer;
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.internal.transformation.MutableRenderingContext;
 import org.xwiki.rendering.renderer.BlockRenderer;
@@ -54,9 +57,9 @@
  * @since 9.11.1
  * @since 10.0
  */
-@Component(roles = EmailTemplateRenderer.class)
+@Component
 @Singleton
-public class EmailTemplateRenderer
+public class DefaultEmailTemplateRenderer implements EmailTemplateRenderer
 {
     private static final String EVENT_BINDING_NAME = "event";
 
@@ -89,18 +92,9 @@ public class EmailTemplateRenderer
     @Inject
     private ExecutionContextManager executionManager;
 
-    /**
-     * Execute a template.
-     *
-     * @param event composite event to render
-     * @param userId id of the user who will receive the email
-     * @param template the template to use
-     * @param syntax syntax of the template and of the output
-     * @return the rendered template
-     * @throws NotificationException if something wrong happens
-     */
-    public Block executeTemplate(CompositeEvent event, String userId, Template template, Syntax syntax)
-        throws NotificationException
+    @Override
+    public Block executeTemplate(CompositeEvent event, String userId, Template template, Syntax syntax,
+        Map<String, Object> customBindings) throws NotificationException
     {
         // Push a new execution context.
         try {
@@ -110,7 +104,7 @@ public Block executeTemplate(CompositeEvent event, String userId, Template templ
         }
 
         try {
-            return executeTemplateInContext(event, userId, template, syntax);
+            return executeTemplateInContext(event, userId, template, syntax, customBindings);
         } finally {
             // Restore parent execution context
             this.execution.popContext();
@@ -127,7 +121,8 @@ public Block executeTemplate(CompositeEvent event, String userId, Template templ
      * @return the rendered template
      * @throws NotificationException if something wrong happens
      */
-    private Block executeTemplateInContext(CompositeEvent event, String userId, Template template, Syntax syntax)
+    private Block executeTemplateInContext(CompositeEvent event, String userId, Template template, Syntax syntax,
+        Map<String, Object> customBindings)
         throws NotificationException
     {
         XWikiContext context = contextProvider.get();
@@ -143,6 +138,9 @@ private Block executeTemplateInContext(CompositeEvent event, String userId, Temp
             // Bind the event to some variable in the velocity context
             scriptContext.setAttribute(EVENT_BINDING_NAME, event, ScriptContext.ENGINE_SCOPE);
             scriptContext.setAttribute(USER_BINDING_NAME, userId, ScriptContext.ENGINE_SCOPE);
+            for (Map.Entry<String, Object> entry : customBindings.entrySet()) {
+                scriptContext.setAttribute(entry.getKey(), entry.getValue(), ScriptContext.ENGINE_SCOPE);
+            }
             // Use the external URL factory to generate full URLs
             context.setURLFactory(new ExternalServletURLFactory(context));
             // Set the given syntax in the rendering context
@@ -163,17 +161,15 @@ private Block executeTemplateInContext(CompositeEvent event, String userId, Temp
             // Cleaning the velocity context
             scriptContext.removeAttribute(EVENT_BINDING_NAME, ScriptContext.ENGINE_SCOPE);
             scriptContext.removeAttribute(USER_BINDING_NAME, ScriptContext.ENGINE_SCOPE);
+            for (String bindingName : customBindings.keySet()) {
+                scriptContext.removeAttribute(bindingName, ScriptContext.ENGINE_SCOPE);
+            }
             // Cleaning the current user
             context.setUserReference(currentUser);
         }
     }
 
-    /**
-     * Render a block to HTML syntax.
-     * 
-     * @param block block to render
-     * @return the HTML rendered version of the block
-     */
+    @Override
     public String renderHTML(Block block)
     {
         WikiPrinter printer = new DefaultWikiPrinter();
@@ -181,15 +177,9 @@ public String renderHTML(Block block)
         return printer.toString();
     }
 
-    /**
-     * Render a block to plain text syntax.
-     * 
-     * @param block block to render
-     * @return the plain text rendered version of the block
-     */
+    @Override
     public String renderPlainText(Block block)
     {
-        // TODO: this does not work at all (templates enforce HTML syntax I guess)
         WikiPrinter printer = new DefaultWikiPrinter();
         plainTextBlockRenderer.render(block, printer);
         return printer.toString();
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/WikiEmailNotificationRenderer.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/WikiEmailNotificationRenderer.java
index d95d1a601880..ac2843756b0d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/WikiEmailNotificationRenderer.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/java/org/xwiki/notifications/notifiers/internal/email/WikiEmailNotificationRenderer.java
@@ -20,12 +20,14 @@
 package org.xwiki.notifications.notifiers.internal.email;
 
 import java.lang.reflect.Type;
+import java.util.Map;
 
 import javax.inject.Inject;
 
 import org.xwiki.component.annotation.Component;
 import org.xwiki.notifications.CompositeEvent;
 import org.xwiki.notifications.NotificationException;
+import org.xwiki.notifications.notifiers.email.EmailTemplateRenderer;
 import org.xwiki.notifications.notifiers.email.NotificationEmailRenderer;
 import org.xwiki.notifications.notifiers.internal.AbstractWikiNotificationRenderer;
 import org.xwiki.rendering.syntax.Syntax;
@@ -77,7 +79,8 @@ public String renderHTML(CompositeEvent compositeEvent, String userId) throws No
     {
         if (this.htmlTemplate != null) {
             return emailTemplateRenderer.renderHTML(
-                    emailTemplateRenderer.executeTemplate(compositeEvent, userId, this.htmlTemplate, Syntax.XHTML_1_0)
+                    emailTemplateRenderer.executeTemplate(compositeEvent, userId, this.htmlTemplate,
+                        Syntax.XHTML_1_0, Map.of())
             );
         }
         // Fallback to the default renderer
@@ -90,7 +93,7 @@ public String renderPlainText(CompositeEvent compositeEvent, String userId) thro
         if (this.plainTextTemplate != null) {
             return emailTemplateRenderer.renderPlainText(
                     emailTemplateRenderer.executeTemplate(compositeEvent, userId, this.plainTextTemplate,
-                            Syntax.PLAIN_1_0)
+                        Syntax.PLAIN_1_0, Map.of())
             );
         }
         // Fallback to the default renderer
@@ -104,7 +107,7 @@ public String generateEmailSubject(CompositeEvent compositeEvent, String userId)
         if (this.emailSubjectTemplate != null) {
             return emailTemplateRenderer.renderPlainText(
                     emailTemplateRenderer.executeTemplate(compositeEvent, userId, this.emailSubjectTemplate,
-                            Syntax.PLAIN_1_0)
+                        Syntax.PLAIN_1_0, Map.of())
             );
         }
         // Fallback to the default renderer
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/resources/META-INF/components.txt
index 1eb24f5a636e..7452d672d230 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/resources/META-INF/components.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/main/resources/META-INF/components.txt
@@ -8,7 +8,7 @@ org.xwiki.notifications.notifiers.internal.WikiNotificationDisplayerComponentBui
 org.xwiki.notifications.notifiers.internal.WikiNotificationDisplayerDocumentInitializer
 org.xwiki.notifications.notifiers.internal.email.DefaultNotificationEmailRenderer
 org.xwiki.notifications.notifiers.internal.email.DefaultPeriodicMimeMessageIterator
-org.xwiki.notifications.notifiers.internal.email.EmailTemplateRenderer
+org.xwiki.notifications.notifiers.internal.email.DefaultEmailTemplateRenderer
 org.xwiki.notifications.notifiers.internal.email.LogoAttachmentExtractor
 org.xwiki.notifications.notifiers.internal.email.MailTemplateImageAttachmentsExtractor
 org.xwiki.notifications.notifiers.internal.email.UserAvatarAttachmentExtractor
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/test/java/org/xwiki/notifications/notifiers/internal/email/DefaultNotificationEmailRendererTest.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/test/java/org/xwiki/notifications/notifiers/internal/email/DefaultNotificationEmailRendererTest.java
new file mode 100644
index 000000000000..39d23ffa19e3
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/src/test/java/org/xwiki/notifications/notifiers/internal/email/DefaultNotificationEmailRendererTest.java
@@ -0,0 +1,197 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.xwiki.notifications.notifiers.internal.email;
+
+import java.util.Map;
+
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.script.ScriptContext;
+
+import org.junit.jupiter.api.Test;
+import org.xwiki.context.Execution;
+import org.xwiki.context.ExecutionContext;
+import org.xwiki.context.ExecutionContextManager;
+import org.xwiki.model.reference.DocumentReference;
+import org.xwiki.notifications.CompositeEvent;
+import org.xwiki.rendering.block.Block;
+import org.xwiki.rendering.block.XDOM;
+import org.xwiki.rendering.internal.transformation.MutableRenderingContext;
+import org.xwiki.rendering.renderer.BlockRenderer;
+import org.xwiki.rendering.renderer.printer.WikiPrinter;
+import org.xwiki.rendering.syntax.Syntax;
+import org.xwiki.rendering.transformation.RenderingContext;
+import org.xwiki.script.ScriptContextManager;
+import org.xwiki.template.Template;
+import org.xwiki.template.TemplateContent;
+import org.xwiki.template.TemplateManager;
+import org.xwiki.test.annotation.BeforeComponent;
+import org.xwiki.test.junit5.mockito.ComponentTest;
+import org.xwiki.test.junit5.mockito.InjectMockComponents;
+import org.xwiki.test.junit5.mockito.MockComponent;
+import org.xwiki.test.mockito.MockitoComponentManager;
+
+import com.xpn.xwiki.XWiki;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.web.ExternalServletURLFactory;
+import com.xpn.xwiki.web.XWikiServletRequestStub;
+import com.xpn.xwiki.web.XWikiURLFactory;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link DefaultEmailTemplateRenderer}.
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+@ComponentTest
+class DefaultNotificationEmailRendererTest
+{
+    @InjectMockComponents
+    private DefaultEmailTemplateRenderer emailTemplateRenderer;
+
+    @MockComponent
+    @Named("xhtml/1.0")
+    private BlockRenderer htmlBlockRenderer;
+
+    @MockComponent
+    @Named("plain/1.0")
+    private BlockRenderer plainTextBlockRenderer;
+
+    @MockComponent
+    private TemplateManager templateManager;
+
+    @MockComponent
+    private ScriptContextManager scriptContextManager;
+
+    @MockComponent
+    private Provider<XWikiContext> contextProvider;
+
+    @MockComponent
+    private Execution execution;
+
+    @MockComponent
+    private ExecutionContextManager executionManager;
+
+    private MutableRenderingContext renderingContext;
+
+    @BeforeComponent
+    void beforeComponent(MockitoComponentManager componentManager) throws Exception
+    {
+        this.renderingContext = mock(MutableRenderingContext.class);
+        componentManager.registerComponent(RenderingContext.class, renderingContext);
+    }
+
+    @Test
+    void renderHtml()
+    {
+        Block block = mock(Block.class);
+        doAnswer(invocation -> {
+            WikiPrinter printer = invocation.getArgument(1);
+            printer.print("42");
+            return null;
+        }).when(this.htmlBlockRenderer).render(eq(block), any());
+        assertEquals("42", this.emailTemplateRenderer.renderHTML(block));
+    }
+
+    @Test
+    void renderPlainText()
+    {
+        Block block = mock(Block.class);
+        doAnswer(invocation -> {
+            WikiPrinter printer = invocation.getArgument(1);
+            printer.print("444");
+            return null;
+        }).when(this.plainTextBlockRenderer).render(eq(block), any());
+        assertEquals("444", this.emailTemplateRenderer.renderPlainText(block));
+    }
+
+    @Test
+    void executeTemplate() throws Exception
+    {
+        CompositeEvent compositeEvent = mock(CompositeEvent.class);
+        String userId = "fooUser";
+        Template template = mock(Template.class);
+        Syntax syntax = Syntax.XWIKI_2_1;
+        Map<String, Object> customBindings = Map.of(
+            "myKey", "aValue",
+            "anotherKey", 8282
+        );
+
+        ExecutionContext currentContext = mock(ExecutionContext.class, "current");
+        when(this.execution.getContext()).thenReturn(currentContext);
+        ExecutionContext cloneContext = mock(ExecutionContext.class, "clone");
+        when(this.executionManager.clone(currentContext)).thenReturn(cloneContext);
+
+        XWikiContext context = mock(XWikiContext.class);
+        when(this.contextProvider.get()).thenReturn(context);
+
+        DocumentReference currentUser = mock(DocumentReference.class, "currentUser");
+        when(context.getUserReference()).thenReturn(currentUser);
+
+        XWikiURLFactory urlFactory = mock(XWikiURLFactory.class);
+        when(context.getURLFactory()).thenReturn(urlFactory);
+
+        XWiki wiki = mock(XWiki.class);
+        when(context.getWiki()).thenReturn(wiki);
+
+        XWikiServletRequestStub xWikiServletRequestStub = mock(XWikiServletRequestStub.class);
+        when(context.getRequest()).thenReturn(xWikiServletRequestStub);
+
+        ScriptContext scriptContext = mock(ScriptContext.class);
+        when(this.scriptContextManager.getScriptContext()).thenReturn(scriptContext);
+
+        TemplateContent templateContent = mock(TemplateContent.class);
+        when(template.getContent()).thenReturn(templateContent);
+
+        DocumentReference templateAuthor = mock(DocumentReference.class, "templateAuthor");
+        when(templateContent.getAuthorReference()).thenReturn(templateAuthor);
+
+        XDOM xdom = mock(XDOM.class);
+        when(this.templateManager.execute(template)).thenReturn(xdom);
+
+        assertEquals(xdom,
+            this.emailTemplateRenderer.executeTemplate(compositeEvent, userId, template, syntax, customBindings));
+
+        verify(this.execution).pushContext(cloneContext);
+        verify(this.execution).popContext();
+        verify(context).setUserReference(templateAuthor);
+        verify(context).setUserReference(currentUser);
+        verify(scriptContext).setAttribute("event", compositeEvent, ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).setAttribute("emailUser", userId, ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).setAttribute("myKey", "aValue", ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).setAttribute("anotherKey", 8282, ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).removeAttribute("event", ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).removeAttribute("emailUser", ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).removeAttribute("myKey", ScriptContext.ENGINE_SCOPE);
+        verify(scriptContext).removeAttribute("anotherKey", ScriptContext.ENGINE_SCOPE);
+        verify(context).setURLFactory(any(ExternalServletURLFactory.class));
+        verify(context).setURLFactory(urlFactory);
+        verify(renderingContext).push(null, null, syntax, null, false, syntax);
+        verify(renderingContext).pop();
+    }
+}
\ No newline at end of file

From 283004ff81a8d5126f39ae68db08e70388b57cba Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 7 Feb 2024 17:01:29 +0100
Subject: [PATCH 105/143] XWIKI-21683: Upgrade to Elastic search client 8.12.1

---
 .../xwiki-platform-activeinstalls2/pom.xml            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
index 1297fdd63f05..9abad50d028f 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
@@ -33,8 +33,17 @@
   <description>Parent POM for the Active Installs 2 modules</description>
   <properties>
     <!-- Tag for the ElasticSearch docker image to use from https://hub.docker.com/_/elasticsearch -->
-    <elasticsearch.version>8.11.2</elasticsearch.version>
+    <elasticsearch.version>8.12.1</elasticsearch.version>
   </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>jakarta.json</groupId>
+        <artifactId>jakarta.json-api</artifactId>
+        <version>2.0.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <pluginManagement>
       <plugins>

From 8b178b646d9e7d0f2f4014fa2e5438c1644fe937 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Wed, 7 Feb 2024 23:05:41 +0200
Subject: [PATCH 106/143] XWIKI-21867: Getting a warning about ckeditor 4.22.1
 having security violations * Disable the version check because we don't plan
 to upgrade to the paid CKEditor license.

---
 .../xwiki-platform-ckeditor-webjar/src/main/webjar/config.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
index d0db49f60d29..3191286a0e66 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js
@@ -302,6 +302,7 @@ CKEDITOR.editorConfig = function(config) {
       },
       'xwiki-macro': {label: 'xwiki-toolbar.otherMacros'}
     },
+    versionCheck: false,
     'xwiki-macro': {
       // You can restrict here the type of content the users can input when editing the macro content / parameters
       // in-line using nested editables, depending on the macro content / parameter type.

From 4618bf149efdb67523578f0801da0db4c9c6796d Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Thu, 8 Feb 2024 09:52:37 +0100
Subject: [PATCH 107/143] XWIKI-21683: Upgrade to Elastic search client 8.12.1
 * move the jakarta.json-api version definition on xwiki-commons along with
 the other jakarta versions

---
 .../xwiki-platform-activeinstalls2/pom.xml               | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
index 9abad50d028f..ffc89a2197dc 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
@@ -35,15 +35,6 @@
     <!-- Tag for the ElasticSearch docker image to use from https://hub.docker.com/_/elasticsearch -->
     <elasticsearch.version>8.12.1</elasticsearch.version>
   </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>jakarta.json</groupId>
-        <artifactId>jakarta.json-api</artifactId>
-        <version>2.0.2</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <build>
     <pluginManagement>
       <plugins>

From 6872d3e9e5ec872d6cc4858ef307dc8d1fb9adb8 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Tue, 6 Feb 2024 15:38:38 +0100
Subject: [PATCH 108/143] XWIKI-18997: Replace the Livetable of the Custom
 Filters on the Notifications Administration with a Live Data macro

---
 .../test/ui/NotificationsSettingsIT.java      |   2 +-
 .../po/AbstractNotificationsSettingsPage.java |  13 +-
 .../AbstractNotificationFilterPreference.java |  16 +-
 .../CustomNotificationFilterModal.java        |  37 +-
 .../CustomNotificationFilterPreference.java   |  49 +-
 .../SystemNotificationFilterPreference.java   |  12 -
 ...cationFilterPreferenceLivetableResults.xml |   2 +-
 ...ficationsCustomFiltersPreferencesMacro.xml | 563 +++++-------------
 .../XWiki/Notifications/Code/Translations.xml |   1 +
 9 files changed, 207 insertions(+), 488 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
index 9b34be25e0d7..11c2462bdb59 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
@@ -697,7 +697,7 @@ void addCustomFilters(TestUtils testUtils)
         customNotificationFilterModal.selectFormats(Set.of(CustomNotificationFilterModal.NotificationFormat.ALERT));
         customNotificationFilterModal.getEventsSelector().selectByValue(UPDATE);
         customNotificationFilterModal.getEventsSelector().selectByValue(DELETE);
-        customNotificationFilterModal.clickSubmit();
+        customNotificationFilterModal.clickSubmit(2);
 
         // check created filters
         customNotificationFilterPreferences = notificationsUserProfilePage.getCustomNotificationFilterPreferences();
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
index 6c8fb0703d90..c05dabd9e89d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/AbstractNotificationsSettingsPage.java
@@ -52,15 +52,8 @@ public abstract class AbstractNotificationsSettingsPage extends ViewPage
 
     private static final String ALERT_FORMAT = "alert";
 
-    private static final String EMAIL_FORMAT = "email";
-
     private static final String VALUE_ATTRIBUTE = "value";
 
-    private static final String ROW_TAG = "tr";
-
-    @FindBy(id = "notificationCustomFilterPreferencesLiveTable-display")
-    protected WebElement notificationCustomFilterPreferencesLivetable;
-
     @FindBy(id = "notificationsPane")
     private WebElement notificationsPane;
 
@@ -73,7 +66,7 @@ public abstract class AbstractNotificationsSettingsPage extends ViewPage
     @FindBy(className = "btn-addfilter")
     private WebElement addFilterButton;
 
-    private Map<String, ApplicationPreferences> applicationPreferences = new HashMap<>();
+    private final Map<String, ApplicationPreferences> applicationPreferences = new HashMap<>();
 
     /**
      * Represents the available email changes settings values.
@@ -300,7 +293,9 @@ public List<SystemNotificationFilterPreference> getSystemNotificationFilterPrefe
     public List<CustomNotificationFilterPreference> getCustomNotificationFilterPreferences()
     {
         List<CustomNotificationFilterPreference> preferences = new ArrayList<>();
-        for (WebElement row : this.notificationCustomFilterPreferencesLivetable.findElements(By.tagName(ROW_TAG))) {
+        LiveDataElement liveDataElement =
+            new LiveDataElement("notificationCustomFilterPreferencesLiveData");
+        for (WebElement row : liveDataElement.getTableLayout().getRows()) {
             preferences.add(new CustomNotificationFilterPreference(this, row, this.getDriver()));
         }
         return preferences;
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
index efd71a8e21d9..5cfc761af920 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
@@ -54,7 +54,7 @@ public abstract class AbstractNotificationFilterPreference
      * Default constructor.
      *
      * @param parentPage the page where the settings are displayed.
-     * @param row the row of the livetable for this filter.
+     * @param row the row of the Live Data for this filter
      * @param webDriver the webdriver to initialize the switches.
      */
     public AbstractNotificationFilterPreference(AbstractNotificationsSettingsPage parentPage, WebElement row,
@@ -81,18 +81,20 @@ public AbstractNotificationFilterPreference(AbstractNotificationsSettingsPage pa
     /**
      * @param row the row to get the formats from
      * @return the {@link WebElement} containing the formats of the row
-     * @since 16.1.0RC1
      */
-
-    protected abstract WebElement getFormatsElement(WebElement row);
+    private WebElement getFormatsElement(WebElement row)
+    {
+        return row.findElement(By.cssSelector("td[data-title='Formats'] .view"));
+    }
 
     /**
      * @param row the row to get the switch from
      * @return the {@link WebElement} containing the switch element of the row
-     * @since 16.1.0RC1
      */
-
-    protected abstract WebElement getBootstrapSwitchElement(WebElement row);
+    private WebElement getBootstrapSwitchElement(WebElement row)
+    {
+        return row.findElement(By.className("displayer-toggle")).findElement(By.className("bootstrap-switch"));
+    }
 
     /**
      * @return the filter name.
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterModal.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterModal.java
index 072d92dd5032..fa62ca50e557 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterModal.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterModal.java
@@ -26,8 +26,9 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 import org.xwiki.index.tree.test.po.DocumentTreeElement;
+import org.xwiki.livedata.test.po.LiveDataElement;
+import org.xwiki.livedata.test.po.TableLayoutElement;
 import org.xwiki.test.ui.po.BaseModal;
-import org.xwiki.test.ui.po.LiveTableElement;
 
 /**
  * Represents the Add filter modal.
@@ -205,21 +206,33 @@ public boolean isSubmitEnabled()
     }
 
     /**
-     * Click on the submit button to add the new filter and wait until the modal is closed and the livetable of
-     * custom filter preferences has been refreshed. Be careful to call {@link #isSubmitEnabled()} before to ensure
-     * the submit button can be clicked.
+     * Click on the Submit button to add the new filter and wait until the modal is closed, and the Live Data of custom
+     * filter preferences has been refreshed. Be careful to call {@link #isSubmitEnabled()} before to ensure the Submit
+     * button can be clicked.
+     *
+     * @see #clickSubmit(int) if the form leads to the creation of more than one notification filter
      */
     public void clickSubmit()
     {
-        LiveTableElement liveTableElement =
-            new LiveTableElement("notificationCustomFilterPreferencesLiveTable");
-        int rowCount = liveTableElement.getRowCount();
+        clickSubmit(1);
+    }
+
+    /**
+     * Click on the Submit button to add new filters and wait until the modal is closed, and the Live Data of custom
+     * filter preferences to be refreshed. Be careful to call {@link #isSubmitEnabled()} before to ensure the Submit
+     * button can be clicked.
+     *
+     * @param offset the expected number of additional notification filters created
+     */
+    public void clickSubmit(int offset)
+    {
+        LiveDataElement liveDataElement =
+            new LiveDataElement("notificationCustomFilterPreferencesLiveData");
+        TableLayoutElement tableLayout = liveDataElement.getTableLayout();
+        int rowCount = tableLayout.countRows();
         getSubmitButton().click();
-        this.waitForClosed();
+        waitForClosed();
 
-        // This first wait might not be enough since the LT was already ready: so it might returns immediately
-        // while we actually want to wait that the number of rows increased. Hence the two waits.
-        liveTableElement.waitUntilReady();
-        liveTableElement.waitUntilRowCountGreaterThan(rowCount + 1);
+        tableLayout.waitUntilRowCountEqualsTo(rowCount + offset);
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
index cf12d60ed4c3..910cce433547 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/CustomNotificationFilterPreference.java
@@ -28,8 +28,11 @@
 import org.xwiki.test.ui.XWikiWebDriver;
 import org.xwiki.test.ui.po.ConfirmationBox;
 
+import static org.xwiki.platform.notifications.test.po.preferences.filters.CustomNotificationFilterPreference.FilterAction.IGNORE_EVENT;
+import static org.xwiki.platform.notifications.test.po.preferences.filters.CustomNotificationFilterPreference.FilterAction.NOTIFY_EVENT;
+
 /**
- * Represents a custom notification filter: i.e. a scope notification filter created by the user or through the watch
+ * Represents a custom notification filter: i.e., a scope notification filter created by the user or through the watch
  * settings.
  *
  * @version $Id$
@@ -38,7 +41,7 @@
 public class CustomNotificationFilterPreference extends AbstractNotificationFilterPreference
 {
     /**
-     * Represents the possible actions for such filter.
+     * Represents the possible actions for such filters.
      *
      * @version $Id$
      */
@@ -55,9 +58,9 @@ public enum FilterAction
         NOTIFY_EVENT
     }
 
-    private List<String> eventTypes = new ArrayList<>();
+    private final List<String> eventTypes = new ArrayList<>();
 
-    private FilterAction filterAction;
+    private final FilterAction filterAction;
 
     /**
      * Default constructor.
@@ -71,7 +74,8 @@ public CustomNotificationFilterPreference(AbstractNotificationsSettingsPage pare
     {
         super(parentPage, row, webDriver);
 
-        List<WebElement> eventTypeElements = row.findElement(By.className("eventTypes")).findElements(By.tagName("li"));
+        List<WebElement> eventTypeElements =
+            row.findElement(By.cssSelector("td[data-title='Events']")).findElements(By.tagName("li"));
         for (WebElement eventType : eventTypeElements) {
             String text = eventType.getText();
             if (!text.startsWith("All events")) {
@@ -79,54 +83,43 @@ public CustomNotificationFilterPreference(AbstractNotificationsSettingsPage pare
             }
         }
 
-        String filterType = row.findElement(By.className("filterType")).getText();
+        String filterType = row.findElement(By.cssSelector("td[data-title='Filter Action'] .view")).getText();
         if (filterType.startsWith("Notify")) {
-            this.filterAction = FilterAction.NOTIFY_EVENT;
+            this.filterAction = NOTIFY_EVENT;
         } else {
-            this.filterAction = FilterAction.IGNORE_EVENT;
+            this.filterAction = IGNORE_EVENT;
         }
     }
 
     @Override
     protected WebElement getNameElement(WebElement row)
     {
-        return row.findElement(By.className("name"));
-    }
-
-    @Override
-    protected WebElement getFormatsElement(WebElement row)
-    {
-        return row.findElement(By.className("notificationFormats"));
-    }
-
-    @Override
-    protected WebElement getBootstrapSwitchElement(WebElement row)
-    {
-        return row.findElement(By.className("isEnabled")).findElement(By.className("bootstrap-switch"));
+        return row.findElement(By.cssSelector("td[data-title='Location']"));
     }
 
     /**
-     * @return the event types or an empty list in case of all events.
+     * @return the event types or an empty list in case of all events
      */
     public List<String> getEventTypes()
     {
-        return eventTypes;
+        return this.eventTypes;
     }
 
     /**
-     * @return the watched location.
+     * @return the watched location
      */
     public String getLocation()
     {
-        return this.getRow().findElement(By.cssSelector("td.name ol")).getAttribute("data-entity");
+        return this.getRow().findElement(By.cssSelector("td[data-title='Location'] .html-wrapper ol"))
+            .getAttribute("data-entity");
     }
 
     /**
-     * @return the action performed by the filter.
+     * @return the action performed by the filter
      */
     public FilterAction getFilterAction()
     {
-        return filterAction;
+        return this.filterAction;
     }
 
     /**
@@ -134,7 +127,7 @@ public FilterAction getFilterAction()
      */
     public void delete()
     {
-        this.getRow().findElement(By.cssSelector("td.actions a.actiondelete")).click();
+        this.getRow().findElement(By.cssSelector(".actions-container .action_delete")).click();
         ConfirmationBox confirmationBox = new ConfirmationBox();
         confirmationBox.clickYes();
         this.getParentPage().waitForNotificationSuccessMessage("Filter preference deleted!");
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
index d4e78ccafa26..9c93039b3390 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/SystemNotificationFilterPreference.java
@@ -53,18 +53,6 @@ protected WebElement getNameElement(WebElement row)
         return row.findElement(By.cssSelector("td[data-title='Name'] .view"));
     }
 
-    @Override
-    protected WebElement getFormatsElement(WebElement row)
-    {
-        return row.findElement(By.cssSelector("td[data-title='Formats'] .view"));
-    }
-
-    @Override
-    protected WebElement getBootstrapSwitchElement(WebElement row)
-    {
-        return row.findElement(By.className("displayer-toggle")).findElement(By.className("bootstrap-switch"));
-    }
-
     /**
      * @return the description of the filter.
      */
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
index 2f0cc067349f..6d8040ff6808 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationFilterPreferenceLivetableResults.xml
@@ -182,6 +182,7 @@
           #end
           #set ($isEnabled = "&lt;input type='checkbox' class='notificationFilterPreferenceCheckbox' data-preferenceId='${preference.id}' $isEnabled $isDisabled /&gt;")
           
+          ## In case of backport of 15.10.x, isEnabled_disabled must be introduced to disabled legacy filters.
           #set ($element = {
             'filterPreferenceId'  : $preference.id,
             'name'                : $display,
@@ -191,7 +192,6 @@
             'isEnabled'           : $isEnabled,
             'doc_viewable'        : true,
             'isEnabled_checked': $preference.isEnabled(),
-            'isEnabled_disabled': $preference.id.startsWith('watchlist_'),
             'isEnabled_data': {
               'preferenceId': $preference.id
             }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsCustomFiltersPreferencesMacro.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsCustomFiltersPreferencesMacro.xml
index ea89fe557cb7..ec935dec0b9b 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsCustomFiltersPreferencesMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsCustomFiltersPreferencesMacro.xml
@@ -77,6 +77,7 @@
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -125,30 +126,33 @@
     </property>
     <property>
       <code>'use strict';
+
+define('notifications-custom-filters-preferences-macro-translation-keys', {
+  prefix: 'notifications.',
+  keys: [
+    'settings.saving',
+    'settings.saved',
+    'settings.savingfailed',
+    'filters.preferences.setEnabled.inProgress',
+    'filters.preferences.setEnabled.done',
+    'filters.preferences.setEnabled.error',
+    'filters.preferences.delete.inProgress',
+    'filters.preferences.delete.done',
+    'filters.preferences.delete.error'
+  ]
+});
+
 /**
  * Start the real script.
  */
-require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($, AddCustomNotificationFilterPreferenceLivetable) {
+require(['jquery', 'NewCustomNotificationFilterModal', 'xwiki-bootstrap-switch', 'xwiki-events-bridge'], function ($, NewCustomNotificationFilterModal) {
 
   /**
-   * Page initialization
+   * Initialize the custom filter modal.
    */
   $(function() {
-
-    new AddCustomNotificationFilterPreferenceLivetable($('#modal-add-custom-filter-preference'), window['livetable_notificationCustomFilterPreferencesLiveTable'], $('.customFilterPreferences button.btn-addfilter'),
+    new NewCustomNotificationFilterModal($('#modal-add-custom-filter-preference'), $("#notificationCustomFilterPreferencesLiveData"), $('.customFilterPreferences button.btn-addfilter'),
       $('.customFilterPreferences').attr('data-doc-url'));
-    var initBootstrapSwitches = function () {
-      $('#notificationCustomFilterPreferencesLiveTable .notificationFilterPreferenceCheckbox, #notificationCustomFilterPreferencesLiveTable .toggleableFilterPreferenceCheckbox').bootstrapSwitch({
-        size: 'mini',
-        labelText: '$escapetool.javascript($services.icon.renderHTML("bell"))'
-      });
-    };
-    $(document).on('xwiki:livetable:displayComplete', function (event, data) {
-      // Enable bootstrap switches
-      initBootstrapSwitches();
-    });
-    initBootstrapSwitches();
-
   });
 });
 </code>
@@ -157,7 +161,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       <name>JS</name>
     </property>
     <property>
-      <parse>1</parse>
+      <parse>0</parse>
     </property>
     <property>
       <use>currentPage</use>
@@ -203,6 +207,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -250,7 +255,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       <cache>long</cache>
     </property>
     <property>
-      <code>define('AddCustomNotificationFilterPreferenceLivetable', ['jquery', 'xwiki-meta', 'bootstrap'], function($, xm) {
+      <code>define('NewCustomNotificationFilterModal', ['jquery', 'xwiki-meta', 'xwiki-l10n!notifications-custom-filters-preferences-macro-translation-keys', 'bootstrap'], function($, xm, l10n) {
 
   return function(modal, filterPreferencesLivetable, buttonAddFilter, docURL) {
     var self = this;
@@ -332,7 +337,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       }
 
       // Saving
-      var notification = new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.settings.saving'))", 'inprogress');
+      var notification = new XWiki.widgets.Notification(l10n['settings.saving'], 'inprogress');
       // We use a "traditional: true" argument here to be sure that the argument names are not transformed to wiki[] etc by jquery. For more info see doc about $.param.
       $.post({
         url: serviceURL,
@@ -340,13 +345,13 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         traditional: true
       }).then(data =&gt; {
         notification.hide();
-        new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.settings.saved'))", 'done');
+        new XWiki.widgets.Notification(l10n['settings.saved'], 'done');
 
-        // Reload the livetable
-        self.filterPreferencesLivetable.refresh();
+        // Reload the Live Data.
+        self.filterPreferencesLivetable.data('liveData').updateEntries();
       }).catch(() =&gt; {
         notification.hide();
-        new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.settings.savingfailed'))", 'error');
+        new XWiki.widgets.Notification(l10n['settings.savingfailed'], 'error');
       });
     };
 
@@ -358,10 +363,10 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
 </code>
     </property>
     <property>
-      <name>Add Notification Filter Preference Livetable</name>
+      <name>Custom notifications creation modal</name>
     </property>
     <property>
-      <parse>1</parse>
+      <parse>0</parse>
     </property>
     <property>
       <use>currentPage</use>
@@ -407,171 +412,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
-        <rows>20</rows>
-        <size>50</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-      </code>
-      <name>
-        <disabled>0</disabled>
-        <name>name</name>
-        <number>1</number>
-        <prettyName>Name</prettyName>
-        <size>30</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </name>
-      <parse>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>yesno</displayType>
-        <name>parse</name>
-        <number>4</number>
-        <prettyName>Parse content</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </parse>
-      <use>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>use</name>
-        <number>3</number>
-        <prettyName>Use this extension</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>currentPage|onDemand|always</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </use>
-    </class>
-    <property>
-      <cache>long</cache>
-    </property>
-    <property>
-      <code>define('CustomToggleableFilterPreference', ['jquery', 'xwiki-bootstrap-switch'], function($) {
-  /**
-  * Construct the Toggleable Filter Preference object.
-  */
-  return function(domElement, docURL, row) {
-    var self               = this;
-    self.domElement        = $(domElement);
-    self.docURL           = docURL;
-    self.row               = row;
-    /**
-     * Initialization
-     */
-    self.init = function () {
-      // On change
-      self.domElement.off('switchChange.bootstrapSwitch.customFilter')
-        .on('switchChange.bootstrapSwitch.customFilter', function(event, state) {
-          setTimeout(function() { self.save(state); }, 1);
-        });
-    };
-
-    /**
-     * Save the filter preference
-     */
-    self.save = function(state) {
-      var notification = new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.settings.saving'))", 'inprogress');
-      var filterName = self.domElement.attr('data-filterName');
-      var objectNumber = self.domElement.attr('data-objectNumber');
-      if (objectNumber == '') {
-        // If the object does not exist yet, create it (make this change a minor edit so it's not displayed, by default, in notifications)
-        var restURL = self.docURL + '/objects?media=json&amp;minorRevision=true';
-        var params = {
-          'className': 'XWiki.Notifications.Code.ToggleableFilterPreferenceClass',
-          'property#filterName': filterName,
-          'property#isEnabled': state ? '1' : '0'
-        };
-        $.post(restURL, params).then(data =&gt; {
-          self.domElement.attr('data-objectNumber', data.number);
-          notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.done'))", 'done');
-        }).catch(() =&gt; {
-          notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.error'))", 'error');
-        });
-      } else if (objectNumber != '') {
-        // If the object already exist, just update its value (make this change a minor edit so it's not displayed, by default, in notifications)
-        var restURL = self.docURL + '/objects/XWiki.Notifications.Code.ToggleableFilterPreferenceClass/' + objectNumber
-          + '/properties/isEnabled?media=json&amp;minorRevision=true';
-        $.ajax(restURL, {
-          method: 'PUT',
-          contentType: 'text/plain',
-          data: state ? '1' : '0'
-        }).then(data =&gt; {
-          notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.done'))", 'done');
-          $(document).trigger('xwiki:livetable:notifications-filters-custom:toggle', {'row': self.row, 'state': state});
-        }).catch(() =&gt; {
-          notification.hide();
-          new XWiki.widgets.Notification("$escapetool.javascript($services.localization.render('notifications.filters.preferences.setEnabled.error'))", 'error');
-        });
-      }
-    };
-
-    // Call init
-    self.init();
-  };
-});
-</code>
-    </property>
-    <property>
-      <name>Custom Toggleable Filter Preference</name>
-    </property>
-    <property>
-      <parse>1</parse>
-    </property>
-    <property>
-      <use>currentPage</use>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.Notifications.Code.NotificationsCustomFiltersPreferencesMacro</name>
-    <number>3</number>
-    <className>XWiki.JavaScriptExtension</className>
-    <guid>e91b3d46-cc48-4d58-ae70-8303b46b8557</guid>
-    <class>
-      <name>XWiki.JavaScriptExtension</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <cache>
-        <cache>0</cache>
-        <defaultValue>long</defaultValue>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>cache</name>
-        <number>5</number>
-        <prettyName>Caching policy</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>long|short|default|forbid</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </cache>
-      <code>
-        <contenttype>PureText</contenttype>
-        <disabled>0</disabled>
-        <editor>PureText</editor>
-        <name>code</name>
-        <number>2</number>
-        <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -622,98 +463,74 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       <code>require([
   'jquery',
   'xwiki-meta',
-  'CustomToggleableFilterPreference',
-  'xwiki-bootstrap-switch',
+  'vue',
+  'xwiki-platform-notifications-webjar',
+  'xwiki-l10n!notifications-custom-filters-preferences-macro-translation-keys',
   'xwiki-events-bridge'
-], function ($, xm, CustomToggleableFilterPreference) {
-
-  $(document).on('xwiki:livetable:notifications-filters-custom:toggle', function(event, data) {
-    var changedRow = $(data.row.isEnabled);
-    if (changedRow.length &gt; 0) {
-      if (data.state) {
-        changedRow.attr("checked", "checked");
-      } else {
-        changedRow.removeAttr("checked");
-      }
-      data.row.isEnabled = changedRow.get(0).outerHTML;
-    }
-  });
+], function ($, xm, Vue, notifications, l10n) {
+  Vue.component('DisplayerToggle', notifications.DisplayerToggle);
 
   // Globals
   var serviceReference = XWiki.Model.resolve('XWiki.Notifications.Code.NotificationPreferenceService',
     XWiki.EntityType.DOCUMENT);
   var serviceURL = new XWiki.Document(serviceReference).getURL('get', 'outputSyntax=plain');
-  var target = $('.customFilterPreferences').attr('data-target');
+  const customFilterPreferences = $('.customFilterPreferences');
+  var target = customFilterPreferences.attr('data-target');
 
-  var docURL = $('.customFilterPreferences').attr('data-doc-url');
   var postParams = {
     csrf: xm.form_token,
     target: target
   };
-  if (target == 'user') {
-    var targetUser = $('.customFilterPreferences').attr('data-user');
-    postParams['user'] = targetUser;
-  };
+  if (target === 'user') {
+    postParams['user'] = customFilterPreferences.attr('data-user');
+  }
 
-  var enhanceRow = function(row, data) {
-    // Delete action
-    $(row).find('a.actiondelete').off('click.deleteCustomFilter').on('click.deleteCustomFilter', function(event) {
-      event.preventDefault();
-      new XWiki.widgets.ConfirmationBox({
-        onYes: function() {
-          var notif = new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-            'notifications.filters.preferences.delete.inProgress')), 'inprogress');
-          var params = {
-            action: 'deleteFilterPreference',
-            filterPreferenceId: data.filterPreferenceId
-          };
-          $.post(serviceURL, $.extend({}, params, postParams)).then(() =&gt; {
-            notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-              'notifications.filters.preferences.delete.done')), 'done'));
-            window.livetable_notificationCustomFilterPreferencesLiveTable.refresh();
-          }).catch(() =&gt; {
-            notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-              'notifications.filters.preferences.delete.error')), 'error'));
-          });
-        }
-      });
+  $(document).on('click', '#notificationCustomFilterPreferencesLiveData .action_delete', function (event) {
+    event.preventDefault();
+    const liveDataEntryId = $(this).parents('[data-livedata-entry-id]').data('livedata-entry-id');
+    new XWiki.widgets.ConfirmationBox({
+      onYes: function () {
+        var notif = new XWiki.widgets.Notification(l10n['filters.preferences.delete.inProgress'], 'inprogress');
+        var params = {
+          action: 'deleteFilterPreference',
+          filterPreferenceId: liveDataEntryId
+        };
+        $.post(serviceURL, $.extend({}, params, postParams)).then(() =&gt; {
+          notif.replace(new XWiki.widgets.Notification(l10n['filters.preferences.delete.done'], 'done'));
+          $('#notificationCustomFilterPreferencesLiveData').data('liveData').updateEntries();
+        }).catch(() =&gt; {
+          notif.replace(new XWiki.widgets.Notification(l10n['filters.preferences.delete.error'], 'error'));
+        });
+      }
     });
-    // Enable / Disable action for classic filter preferences
-    $(row).find('.notificationFilterPreferenceCheckbox').off('switchChange.bootstrapSwitch.customFilter')
-    .on('switchChange.bootstrapSwitch.customFilter', function(event, state) {
-      var notif = new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-        'notifications.filters.preferences.setEnabled.inProgress')), 'inprogress');
-      var params = {
+  });
+
+  function save(checked, filterPreferenceId, serviceURL) {
+    return new Promise((resolve) =&gt; {
+      const notif = new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.inProgress'], 'inprogress');
+      const params = {
         action: 'setFilterPreferenceEnabled',
-        filterPreferenceId: data.filterPreferenceId,
-        enabled: state
+        filterPreferenceId: filterPreferenceId,
+        enabled: checked
       };
       $.post(serviceURL, $.extend({}, params, postParams)).then(() =&gt; {
-        notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-          'notifications.filters.preferences.setEnabled.done')), 'done'));
-        $(document).trigger('xwiki:livetable:notifications-filters-custom:toggle', {'row': data, 'state': state});
+        notif.replace(new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.done'], 'done'));
+        resolve({checked})
       }).catch(() =&gt; {
-        notif.replace(new XWiki.widgets.Notification($jsontool.serialize($services.localization.render(
-          'notifications.filters.preferences.setEnabled.error')), 'error'));
+        notif.replace(new XWiki.widgets.Notification(l10n['filters.preferences.setEnabled.error'], 'error'));
+        resolve({checked: !checked})
       });
     });
-    // Enable / Disable action for toggleable filter preferences
-    $(row).find('.toggleableFilterPreferenceCheckbox').each(function() {
-      new CustomToggleableFilterPreference(this, docURL, data);
-    });
-  };
-
-  // Callback on livetable row printing
-  $(document).on('xwiki:livetable:notificationCustomFilterPreferencesLiveTable:newrow', function(event, data) {
-    enhanceRow(data.row, data.data);
-  });
+  }
 
-  // Initializer
-  $(function() {
-    // This script is usually loaded after the live table is displayed and so the previous callback might not be called.
-    $('#notificationCustomFilterPreferencesLiveTable-display &gt; tr[data-index]').each(function() {
-      var data = window.livetable_notificationCustomFilterPreferencesLiveTable.fetchedRows[$(this).data('index')];
-      enhanceRow(this, data);
+  $(document).on('xwiki:livedata:toggle', '#notificationCustomFilterPreferencesLiveData', (event) =&gt; {
+    const detail = event.detail;
+    const data = detail.data
+    save(detail.checked, data.preferenceId, serviceURL).then(({checked}) =&gt; {
+      detail.callback({
+        ...detail,
+        checked: checked
+      });
     });
   });
 });</code>
@@ -722,135 +539,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       <name>Filter Preferences Livetable Callback</name>
     </property>
     <property>
-      <parse>1</parse>
-    </property>
-    <property>
-      <use>currentPage</use>
-    </property>
-  </object>
-  <object>
-    <name>XWiki.Notifications.Code.NotificationsCustomFiltersPreferencesMacro</name>
-    <number>0</number>
-    <className>XWiki.StyleSheetExtension</className>
-    <guid>78413304-d950-417e-8b11-094a771546e4</guid>
-    <class>
-      <name>XWiki.StyleSheetExtension</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <cache>
-        <cache>0</cache>
-        <defaultValue>long</defaultValue>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>cache</name>
-        <number>5</number>
-        <prettyName>Caching policy</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>long|short|default|forbid</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </cache>
-      <code>
-        <contenttype>PureText</contenttype>
-        <disabled>0</disabled>
-        <editor>PureText</editor>
-        <name>code</name>
-        <number>2</number>
-        <prettyName>Code</prettyName>
-        <rows>20</rows>
-        <size>50</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-      </code>
-      <contentType>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>contentType</name>
-        <number>6</number>
-        <prettyName>Content Type</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>CSS|LESS</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </contentType>
-      <name>
-        <disabled>0</disabled>
-        <name>name</name>
-        <number>1</number>
-        <prettyName>Name</prettyName>
-        <size>30</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </name>
-      <parse>
-        <disabled>0</disabled>
-        <displayFormType>select</displayFormType>
-        <displayType>yesno</displayType>
-        <name>parse</name>
-        <number>4</number>
-        <prettyName>Parse content</prettyName>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-      </parse>
-      <use>
-        <cache>0</cache>
-        <disabled>0</disabled>
-        <displayType>select</displayType>
-        <freeText>forbidden</freeText>
-        <largeStorage>0</largeStorage>
-        <multiSelect>0</multiSelect>
-        <name>use</name>
-        <number>3</number>
-        <prettyName>Use this extension</prettyName>
-        <relationalStorage>0</relationalStorage>
-        <separator> </separator>
-        <separators>|, </separators>
-        <size>1</size>
-        <unmodifiable>0</unmodifiable>
-        <values>currentPage|onDemand|always</values>
-        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-      </use>
-    </class>
-    <property>
-      <cache>long</cache>
-    </property>
-    <property>
-      <code>#notificationCustomFilterPreferencesLiveTable select.pagesizeselect {
-  width: auto;
-}
-
-.modal-description {
-   .text-muted-smaller;
-    font-weight: 400;
-    text-transform: none;
-}</code>
-    </property>
-    <property>
-      <contentType>LESS</contentType>
-    </property>
-    <property>
-      <name>NotificationFilterPreferences</name>
-    </property>
-    <property>
-      <parse/>
+      <parse>0</parse>
     </property>
     <property>
       <use>currentPage</use>
@@ -896,7 +585,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <separators>|, </separators>
         <size>5</size>
         <unmodifiable>0</unmodifiable>
-        <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -916,6 +605,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>code</name>
         <number>10</number>
         <prettyName>Macro code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -928,6 +618,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>contentDescription</name>
         <number>9</number>
         <prettyName>Content description (Not applicable for "No content" type)</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -996,6 +687,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>description</name>
         <number>3</number>
         <prettyName>Macro description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -1089,14 +781,13 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
 ### CSS and JAVASCRIPTS
 ######################################################
 #set ($discard = $xwiki.jsx.use('XWiki.Notifications.Code.NotificationsCustomFiltersPreferencesMacro'))
-#set ($discard = $xwiki.ssx.use('XWiki.Notifications.Code.NotificationsCustomFiltersPreferencesMacro'))
 ## TODO: replace by $xwiki.sswx.use() or something like this when XWIKI-12788 is closed.
 #set ($discard = $xwiki.linkx.use($services.webjars.url('bootstrap-switch', 'css/bootstrap3/bootstrap-switch.min.css'), {'type': 'text/css', 'rel': 'stylesheet'}))
 ######################################################
 ### MACRO CONTENT
 ######################################################
 {{html clean="false"}}
-&lt;div class="customFilterPreferences xform" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData&gt;
+&lt;div class="customFilterPreferences" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData&gt;
   &lt;div class="row"&gt;
     &lt;p class="xHint col-xs-12 col-sm-9 col-md-8 col-lg-9"&gt;
       $escapetool.xml($services.localization.render('notifications.settings.filters.preferences.custom.hint'))
@@ -1107,29 +798,41 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       &lt;/button&gt;
     &lt;/div&gt;
   &lt;/div&gt;
-  #set($collist  = ['name', 'filterType', 'eventTypes', 'notificationFormats', 'isEnabled', '_actions'])
-  #set($colprops = {
-    'name':                { 'sortable': false, 'html': true, 'filterable': false },
-    'filterType':          { 'sortable': false, 'filterable': false },
-    'eventTypes':          { 'sortable': false, 'html': true, 'filterable': false },
-    'notificationFormats': { 'sortable': false, 'html': true, 'filterable': false },
-    'isEnabled':           { 'sortable': false, 'html' : true, 'filterable': false },
-    '_actions':            { 'sortable': false, 'actions': ['delete'], 'filterable': false}
+  #set ($sourceParameters = {
+    'translationPrefix': 'notifications.settings.filters.preferences.custom.table.',
+    'resultPage': 'XWiki.Notifications.Code.NotificationFilterPreferenceLivetableResults',
+    'eventType': '',
+    'format': '',
+    'type': 'custom'
   })
-  #set ($extraParams = "eventType=&amp;format=&amp;type=custom")
   #if ($wikimacro.parameters.target == 'user')
-    #set ($extraParams = "$extraParams&amp;user=${services.model.serialize($targetUser, 'default')}")
+    #set ($discard = $sourceParameters.put('user', $services.model.serialize($targetUser, 'default')))
   #end
-  #set($options  = {
-    'resultPage'        : 'XWiki.Notifications.Code.NotificationFilterPreferenceLivetableResults',
-    'rowCount'          : 10,
-    'description'       : 'This table lists every custom filter registered for the given user or current wiki.',
-    'translationPrefix' : 'notifications.settings.filters.preferences.custom.table.',
-    'extraParams'       : $extraParams,
-    'outputOnlyHtml'    : true
+  #set ($liveDataConfig = {
+    'meta': {
+      'propertyDescriptors': [
+        { 'id': 'notificationFormats', 'displayer': 'html', 'filterable': false, 'sortable': false },
+        { 'id': 'isEnabled', 'displayer': 'toggle', 'filterable': false, 'sortable': false },
+        { 'id': 'name', 'displayer': 'html', 'filterable': false, 'sortable': false},
+        { 'id': 'filterType', 'filterable': false, 'sortable': false},
+        { 'id': 'eventTypes', 'displayer': 'html', 'filterable': false, 'sortable': false}
+      ],
+      'actions': [
+        {'id': 'delete', 'allowProperty': 'doc.viewable'}
+      ],
+      'entryDescriptor': {
+          'idProperty': 'filterPreferenceId'
+      }
+    }
   })
-
-  #livetable("notificationCustomFilterPreferencesLiveTable" $collist $colprops $options)
+  $services.liveData.render({
+    'id': 'notificationCustomFilterPreferencesLiveData',
+    'properties': 'name,filterType,eventTypes,notificationFormats,isEnabled,_actions',
+    'source': 'liveTable',
+    'sourceParameters': $escapetool.url($sourceParameters),
+    'description': $services.localization.render('notifications.settings.filters.preferences.custom.table.description'),
+    'limit': 10
+  }, $liveDataConfig)
 &lt;/div&gt;
 ######################################################
 ### ADD FILTER MODAL
@@ -1140,7 +843,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
       &lt;div class="modal-header"&gt;
         &lt;button type="button" class="close" data-dismiss="modal" aria-label="Close"&gt;&lt;span aria-hidden="true"&gt;&amp;times;&lt;/span&gt;&lt;/button&gt;
         &lt;div class="modal-title"&gt;$escapetool.xml($services.localization.render('notifications.settings.addFilter'))&lt;/div&gt;
-        &lt;div class="modal-description"&gt;$escapetool.xml($services.localization.render('notifications.settings.addFilter.hint'))&lt;/div&gt;
+        &lt;div class="modal-description text-muted-smaller"&gt;$escapetool.xml($services.localization.render('notifications.settings.addFilter.hint'))&lt;/div&gt;
       &lt;/div&gt;
       &lt;div class="modal-body"&gt;
         &lt;div class="xform"&gt;
@@ -1272,6 +975,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -1297,13 +1001,24 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
@@ -1350,6 +1065,7 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -1375,13 +1091,24 @@ require(['jquery', 'AddCustomNotificationFilterPreferenceLivetable', 'xwiki-boot
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </name>
       <type>
+        <cache>0</cache>
+        <defaultValue>Unknown</defaultValue>
         <disabled>0</disabled>
+        <displayType>input</displayType>
+        <freeText>allowed</freeText>
+        <largeStorage>1</largeStorage>
+        <multiSelect>0</multiSelect>
         <name>type</name>
         <number>5</number>
+        <picker>1</picker>
         <prettyName>Parameter type</prettyName>
-        <size>60</size>
+        <relationalStorage>0</relationalStorage>
+        <separator>|</separator>
+        <separators>|</separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+        <values>Unknown|Wiki</values>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </type>
     </class>
     <property>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
index b0198919b881..69bc67a5964a 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml
@@ -109,6 +109,7 @@ notifications.settings.filters.preferences.custom.table.eventTypes=Events
 notifications.settings.filters.preferences.custom.table.notificationFormats=Formats
 notifications.settings.filters.preferences.custom.table.isEnabled=Is enabled?
 notifications.settings.filters.preferences.custom.table._actions=Actions
+notifications.settings.filters.preferences.custom.table.description=This table lists every custom filter registered for the given user or current wiki.
 notifications.filters.type.custom.inclusive=Notify of the event
 notifications.filters.type.custom.exclusive=Ignore the event
 

From 07efa1594ddcc57c8cf714d20bb3e083a8b050b9 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Thu, 8 Feb 2024 15:36:28 +0100
Subject: [PATCH 109/143] XWIKI-12179: MailSenderScriptService will throw a
 nullpointerexception if there is any issue instead of returning null

  * Bulletproof the API by checking if the result is null before using
    it
---
 .../java/org/xwiki/mail/script/MailSenderScriptService.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java
index 661cdbd2969e..036d0b4cf26b 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java
@@ -236,8 +236,10 @@ public ScriptMailResult send(Iterable<? extends MimeMessage> messages, String hi
     {
         ScriptMailResult scriptMailResult = sendAsynchronously(messages, hint);
 
-        // Wait for all messages from this batch to have been sent before returning
-        scriptMailResult.getStatusResult().waitTillProcessed(Long.MAX_VALUE);
+        if (scriptMailResult != null) {
+            // Wait for all messages from this batch to have been sent before returning
+            scriptMailResult.getStatusResult().waitTillProcessed(Long.MAX_VALUE);
+        }
 
         return scriptMailResult;
     }

From adb4ae1b40351117109f8530aa5d3e73f8b8fb7b Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 07:37:19 +0000
Subject: [PATCH 110/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/Sandbox.WebHome
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/sandbox-webhome/uk/
---
 .../src/main/resources/Sandbox/WebHome.uk.xml                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-sandbox/src/main/resources/Sandbox/WebHome.uk.xml b/xwiki-platform-core/xwiki-platform-sandbox/src/main/resources/Sandbox/WebHome.uk.xml
index 16be4bb664a4..f0b991e14658 100644
--- a/xwiki-platform-core/xwiki-platform-sandbox/src/main/resources/Sandbox/WebHome.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-sandbox/src/main/resources/Sandbox/WebHome.uk.xml
@@ -42,7 +42,7 @@
 Не варто турбуватися про перезапис або втрати чогось при редагуванні сторінки, ви завжди можете повернутися до першої версії сторінки з вкладки «Історія» в нижній частині сторінки.
 {{/info}}
 
-Якщо ви хочете переглянути базовий [[XWiki Syntaxe&gt;&gt;XWiki.XWikiSyntax]]], ви можете натиснути на «Вікі Код» у меню «Показати» або натиснути на вкладку «Джерело» під час редагування сторінки.
+Якщо ви хочете переглянути базовий [[XWiki Syntax&gt;&gt;XWiki.XWikiSyntax]], ви можете натиснути на «Вікі Код» у меню «Показати» або натиснути на вкладку «Джерело» під час редагування сторінки.
 
 Ось ряд тестових сторінок, з якими можна пограти:
 
@@ -50,7 +50,7 @@
 * [[Sandbox Test Page 2&gt;&gt;Sandbox.TestPage2]]
 * [[Sandbox Test Page 3&gt;&gt;Sandbox.TestPage3]]
 
-Нижче наведено приклад [[XWiki Syntaxe&gt;&gt;XWiki.XWikiSyntax]], який можна використовувати на сторінках вікі (заголовки, зображення, таблиці).
+Нижче наведено приклад [[XWiki Syntax&gt;&gt;XWiki.XWikiSyntax]], який можна використовувати на сторінках вікі (заголовки, зображення, таблиці).
 
 == Заголовки ==
 

From ba1339c4cb56c719ba554f5455b86e0848fd39ba Mon Sep 17 00:00:00 2001
From: Simpel <git@simpel.cc>
Date: Tue, 6 Feb 2024 18:45:10 +0000
Subject: [PATCH 111/143] Translated using Weblate (German)

Currently translated at 100.0% (85 of 85 strings)

Translation: XWiki Platform/LiveData - Macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/livedata-macro/de/
---
 .../src/main/resources/ApplicationResources_de.properties  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
index aa47f2516201..89a35d45cff9 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_de.properties
@@ -71,6 +71,8 @@ rendering.macro.liveData.parameter.showPageSizeDropdown.name=Drop-down-Men\u00FC
 rendering.macro.liveData.parameter.showPageSizeDropdown.description=Blenden Sie das Drop-down-Men\u00FC f\u00FCr die Seitengr\u00F6\u00DFe ein oder aus, mit dem der Benutzer die Anzahl der pro Seite angezeigten Eintr\u00E4ge \u00E4ndern kann.
 rendering.macro.liveData.parameter.pageSizes.name=Seitengr\u00F6\u00DFen
 rendering.macro.liveData.parameter.pageSizes.description=Die durch Kommas getrennte Liste der Seitengr\u00F6\u00DFen, die im Dropdown-Men\u00FC f\u00FCr die Seitengr\u00F6\u00DFe angezeigt werden sollen.
+rendering.macro.liveData.parameter.description.name=Beschreibung
+rendering.macro.liveData.parameter.description.description=Eine optionale textuelle Beschreibung der Live-Daten.
 
 #
 # Translation keys for the live data widget.
@@ -100,7 +102,9 @@ livedata.pagination.next=N\u00E4chste Seite
 livedata.pagination.last=Letzte Seite
 livedata.action.refresh=Aktualisieren
 livedata.action.addEntry=Eintrag hinzuf\u00FCgen
-livedata.action.resizeColumn.hint=Zum \u00C4ndern der Gr\u00F6\u00DFe ziehen. Zum Zur\u00FCcksetzen doppelklicken.
+livedata.action.columnName.default.hint=Ziehe oder benutze die Pfeiltasten, um diese Eigenschaft neu anzuordnen.
+livedata.action.columnName.sortable.hint=Klicke darauf, um die Eintr\u00E4ge nach dieser Eigenschaft zu sortieren. Ziehe oder benutze die Pfeiltasten, um die Reihenfolge zu \u00E4ndern.
+livedata.action.resizeColumn.hint=Ziehe oder benutze die Pfeiltasten, um die Gr\u00F6\u00DFe zu \u00E4ndern. Zum Zur\u00FCcksetzen doppelklicken oder Escape dr\u00FCcken.
 livedata.panel.filter.title=Filter
 livedata.panel.filter.noneFilterable=Keine der angezeigten Eigenschaften ist filterbar.
 livedata.panel.filter.addConstraint=Einschr\u00E4nkung hinzuf\u00FCgen
@@ -144,3 +148,4 @@ livedata.action.reorder.hint=Ziehen zum Neuanordnen
 
 ## Used to indicate where deprecated keys end
 #@deprecatedend
+

From 11fbd124d2639f46422264f2e616b4d5a903f829 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:13:01 +0000
Subject: [PATCH 112/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxOtherSyntaxes
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxothersyntaxes/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxOtherSyntaxes.uk.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxOtherSyntaxes.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxOtherSyntaxes.uk.xml
index 86ae8a6e186d..66d34a024297 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxOtherSyntaxes.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxOtherSyntaxes.uk.xml
@@ -43,7 +43,7 @@
 
 == Інші синтаксиси ==
 
-=== 1.0 Інші синтаксиси ===
+=== 1.0 Other Syntaxes ===
 
-Інші синтаксиси [[доступні &gt;&gt; https://extensions.xwiki.org/xwiki/bin/view/ExtensionCode/AllExtensions/WebHome#%7Ct=extensions&amp;category=syntax]].</content>
+Інші синтаксиси доступні за [[посиланням&gt;&gt;https://extensions.xwiki.org/xwiki/bin/view/ExtensionCode/AllExtensions/WebHome#%7Ct=extensions&amp;category=syntax]].</content>
 </xwikidoc>

From 8037465018e4fb92c9382c518da3680851ed025f Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:42:00 +0000
Subject: [PATCH 113/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxEscapes
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxescapes/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
index 6d2dbad91d2b..1054e8670b62 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxEscapes.uk.xml
@@ -43,14 +43,14 @@
 
 == Екранування ==
 
-=== Екранування 1.0 ===
+=== 1.0 Escapes ===
 
 Дозволяє екранувати синтаксис XWiki.
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Екранування символу|{{{Це не [посилання]}}}|{{{Це не [посилання]}}}
 
-=== Екранування 2.0 ===
+=== 2.0 Escapes ===
 
 Дозволяє екранувати синтаксис XWiki.
 

From 150480b3c92778d55be4754e21ff6bb32341451e Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:22:09 +0000
Subject: [PATCH 114/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxHorizontalLine
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxhorizontalline/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxHorizontalLine.uk.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHorizontalLine.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHorizontalLine.uk.xml
index 0c7845997a2a..bed87ecb2f49 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHorizontalLine.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHorizontalLine.uk.xml
@@ -43,7 +43,7 @@
 
 == Горизонтальна лінія ==
 
-=== Горизонтальна лінія 1.0 ===
+=== 1.0 Horizontal Line ===
 
 {{info}}Має бути 4 або більше дефісів.{{/info}}
 
@@ -54,7 +54,7 @@
 ----
 )))
 
-=== Горизонтальна лінія 2.0 ===
+=== 2.0 Horizontal Line ===
 
 {{info}}Має бути 4 або більше дефісів.{{/info}}
 

From 4af285d39c3ba664a17f7c7cf5afac7e7c453b9e Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:43:10 +0000
Subject: [PATCH 115/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxParameters
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxparameters/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxParameters.uk.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParameters.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParameters.uk.xml
index 69e52b4c7c6e..d89c9de5f063 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParameters.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParameters.uk.xml
@@ -43,7 +43,7 @@
 
 == Параметри ==
 
-=== Параметри 1.0 ===
+=== 1.0 Parameters ===
 
 У XWiki Syntax 1.0 немає синтаксису для передачі параметрів, і єдиним способом зробити це було написати XHTML безпосередньо у вмісті, як показано в таблиці нижче.
 
@@ -54,7 +54,7 @@
 &lt;h1 class="myClass" style="myStyle" id="myId"&gt;заголовок&lt;/h1&gt;
 }}})))
 
-=== Параметри 2.0 ===
+=== 2.0 Parameters ===
 
 За допомогою XWiki Syntax {{velocity}}$crtSyntaxVer{{/velocity}} можна передавати параметри до різних елементів синтаксису, а також до блоків тексту. Це використовується, наприклад, для їх стилізації. Ви можете встановити будь-яку пару параметрів ключ/значення. Засіб візуалізації XHTML передаватиме ці параметри як атрибути XHTML базовому представленню XHTML різних елементів синтаксису.
 

From 75a91c9d38727b446878f63630bb7befd45a3554 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:18:43 +0000
Subject: [PATCH 116/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxHeadings
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxheadings/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxHeadings.uk.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHeadings.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHeadings.uk.xml
index 7e60cc3f366c..a62e6817c57f 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHeadings.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHeadings.uk.xml
@@ -43,7 +43,7 @@
 
 == Заголовки ==
 
-=== Заголовки 1.0 ===
+=== 1.0 Headings ===
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Стандартні заголовки|(((
@@ -67,7 +67,7 @@
 )))
 |Заголовки із синтаксисом XWiki|1.1.1 Заголовок із *жирним шрифтом*|(((=== Заголовок із **жирним шрифтом** ===)))
 
-=== Заголовки 2.0 ===
+=== 2.0 Headings ===
 
 |=Функція|=Синтаксис XWiki {{velocity}}$crtSyntaxVer{{/velocity}}|=Результат
 |Стандартні заголовки|((({{{

From d0bbf778f4388c187bec6fed7cc2246eb078372d Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:15:24 +0000
Subject: [PATCH 117/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxParagraphs
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxparagraphs/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxParagraphs.uk.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParagraphs.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParagraphs.uk.xml
index 382ace37d3d1..9bd1862be91b 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParagraphs.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxParagraphs.uk.xml
@@ -43,7 +43,7 @@
 
 == Параграфи ==
 
-=== Параграфи 1.0 ===
+=== 1.0 Paragraphs ===
 
 Параграфами є елементи тексту, розділені двома або більше новими рядками.
 
@@ -56,7 +56,7 @@
 |Два параграфи|Параграф перший\\Параграф другий|Параграф перший\\Параграф другий
 |Параметризований параграф|&lt;p style="text-align:center;color:blue"&gt;Синій параграф по центру&lt;/p&gt;|(% style="text-align:center;color:blue" %)Синій параграф по центру
 
-=== Параграфи 2.0 ===
+=== 2.0 Paragraphs ===
 
 Параграфами є елементи тексту, розділені двома або більше новими рядками.
 

From 159fed67e8d1654916bcc8b9c6ea8c8aedec2ca7 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:48:19 +0000
Subject: [PATCH 118/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxHTML
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxhtml/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxHTML.uk.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHTML.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHTML.uk.xml
index a003d4f6acba..217be75838cb 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHTML.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxHTML.uk.xml
@@ -41,14 +41,14 @@
 == HTML ==
 
 {{comment}}будь ласка, не перекладайте підзаголовки{{/comment}}
-=== HTML 1.0 ===
+=== 1.0 HTML ===
 
 {{info}}У XWiki Syntax 1.0 можна вводити HTML-розмітку безпосередньо в текст.{{/info}}
 
 |=Синтаксис XWiki 1.0|=Результат
 |&lt;abbr title="HyperText Markup Language"&gt;HTML&lt;/abbr&gt;|{{html}}&lt;abbr title="HyperText Markup Language"&gt;HTML&lt;/abbr&gt;{{/html}}
 
-=== HTML 2.0 ===
+=== 2.0 HTML ===
 
 {{info}}У синтаксисі XWiki {{velocity}}$crtSyntaxVer{{/velocity}} HTML або XHTML потрібно вводити за допомогою [[HTML макроса&gt;&gt;https://extensions.xwiki.org/xwiki/bin/ view/Extension/HTML%20Macro]].{{/info}}
 

From 2d3e687cd45a8a697a2466cd0e3391ce065af631 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:09:25 +0000
Subject: [PATCH 119/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxIntroduction
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxintroduction/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxIntroduction.uk.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxIntroduction.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxIntroduction.uk.xml
index 4fba0531943c..40fa3907149f 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxIntroduction.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxIntroduction.uk.xml
@@ -41,13 +41,13 @@
 == Вступ ==
 
 {{comment}}будь ласка, не перекладайте підзаголовки{{/comment}}
-=== Вступ 1.0 ===
+=== 1.0 Introduction ===
 
 Синтаксис XWiki 1.0 був першою спробою реалізувати синтаксис стилю Wiki у XWiki. Він мав певні обмеження, і деяке форматування можна було досягти лише шляхом вставки необробленого HTML. Рекомендуємо використовувати новіший синтаксис; синтаксис XWiki 1.0 підтримується лише для зворотної сумісності.
 
 Окрім синтаксису, специфічного для XWiki, ми також змінили наш основний механізм візуалізації у XWiki 1.7 (раніше це був Radeox) на користь нашого власного механізму, який є обгорткою розширеного набору навколо [[Wikimodel&gt;&gt;https://code.google.com /p/wikimodel/]] і [[Doxia&gt;&gt;https://maven.apache.org/doxia/]] (і, можливо, інші в майбутньому). Це дозволило нам надати інші синтаксиси у вікі: {{velocity}}[[MediaWiki, Confluence, JSPWiki, Creole, TWiki тощо&gt;&gt;||queryString="syntax=1.0&amp;section=OtherSyntaxes#if($request.xpage )&amp;xpage=$escapetool.url($request.xpage)#end"]]{{/velocity}}.
 
-=== Вступ 2.0 ===
+=== 2.0 Introduction ===
 
 Починаючи з XWiki 1.7, ми представили новий синтаксис вікі. Ми назвали старий синтаксис //XWiki Syntax 1.0//, а новий синтаксис логічно було названо //XWiki Syntax 2.0//. Основними причинами впровадження нового синтаксису були:
 * Виправлено обмеження та неоднозначність синтаксису XWiki 1.0 (який був натхненний як Radeox — основним механізмом візуалізації — так і TWiki).
@@ -57,7 +57,7 @@
 
 На додаток до цих специфічних для XWiki синтаксисів ми також змінили наш основний механізм візуалізації (раніше Radeox) на користь нашого власного механізму, який є обгорткою розширеного набору навколо [[Wikimodel&gt;&gt;https://code.google.com/p/ wikimodel/]] і [[Doxia&gt;&gt;https://maven.apache.org/doxia/]] (і, можливо, інші в майбутньому). Це дозволило нам надати інші синтаксиси у вікі: {{velocity}}[[MediaWiki, Confluence, JSPWiki, Creole, TWiki тощо&gt;&gt;||queryString="syntax=2.0&amp;section=OtherSyntaxes#if($request.xpage )&amp;xpage=$escapetool.url($request.xpage)#end"]]{{/velocity}}.
 
-=== Вступ 2.1 ===
+=== 2.1 Introduction ===
 
 Синтаксис XWiki 2.0 виявився досить корисним і надійним загалом; однак після його впровадження було виявлено кілька недоліків. Відповідні вдосконалення було закріплено у XWiki Syntax 2.1. Деякі нові можливості цього синтаксису:
 * Гомогенізація синтаксису посилань і зображень для кращої чіткості, узгодженості та можливості розширення.

From 7837337fdad92dc0401db919435b5839da391ce9 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:28:05 +0000
Subject: [PATCH 120/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxDefinitionLists
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxdefinitionlists/uk/
---
 .../main/resources/XWiki/XWikiSyntaxDefinitionLists.uk.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxDefinitionLists.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxDefinitionLists.uk.xml
index 8a9fdd2144ca..6cfcc0b3a146 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxDefinitionLists.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxDefinitionLists.uk.xml
@@ -43,7 +43,7 @@
 
 == Списки визначень ==
 
-=== Списки визначень 1.0 ===
+=== 1.0 Definition Lists ===
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Стандартне визначення|((({{{
@@ -82,7 +82,7 @@
 : визначення
 )))
 
-=== Списки визначень 2.0 ===
+=== 2.0 Definition Lists ===
 
 |=Функція|=Синтаксис XWiki {{velocity}}$crtSyntaxVer{{/velocity}}|=Результат
 |Стандартне визначення|((({{{

From 4855d09b7378eea9af481eb82ea58be0cce6a5fa Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:26:46 +0000
Subject: [PATCH 121/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxLists
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxlists/uk/
---
 .../resources/XWiki/XWikiSyntaxLists.uk.xml   | 187 +++++++++++++++++-
 1 file changed, 185 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLists.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLists.uk.xml
index 82960a5fb587..5d2ceafe85e6 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLists.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLists.uk.xml
@@ -43,9 +43,9 @@
 
 == Списки ==
 
-=== 1.0 Списки ===
+=== 1.0 Lists ===
 
-{{info}}Деякі зі згаданих стилів працюють не в усіх браузерах. Щоб отримати повний список, перейдіть за [[це посилання&gt;&gt;http://www.quirksmode.org/css/lists.html]].{{/info}}
+{{info}}Деякі зі згаданих стилів працюють не в усіх браузерах. Щоб отримати повний список, перейдіть за [[цим посилання&gt;&gt;http://www.quirksmode.org/css/lists.html]].{{/info}}
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Маркований список|((({{{
@@ -224,5 +224,188 @@
 (% style="list-style-type: cjk-ideographic" %)
 * Пункт 1
 * Пункт 2
+)))
+
+=== 2.0 Lists ===
+
+{{info}}Some of the mentioned styles do not work on all browsers. For a comprehensive list follow [[this link&gt;&gt;http://www.quirksmode.org/css/lists.html]].{{/info}}
+
+|=Feature|=XWiki Syntax {{velocity}}$crtSyntaxVer{{/velocity}}|=Result
+|Bulleted list|((({{{
+* item 1
+** item 2
+*** item 3
+* item 4
+}}})))|(((
+* item 1
+** item 2
+*** item 3
+* item 4
+)))
+|Numbered list|((({{{
+1. item 1
+11. item 2
+111. item 3
+1. item 4
+}}})))|(((
+1. item 1
+11. item 2
+111. item 3
+1. item 4
+)))
+|Mixed list|((({{{
+1. item 1
+1*. item 2
+1*. item 3
+1. item 4
+}}})))|(((
+1. item 1
+1*. item 2
+1*. item 3
+1. item 4
+)))
+|Square list|((({{{
+(% style="list-style-type: square" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: square" %)
+* item 1
+* item 2
+)))
+|Disc list|((({{{
+(% style="list-style-type: disc" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: disc" %)
+* item 1
+* item 2
+)))
+|Lowercase Alphabetical list|((({{{
+(% style="list-style-type: lower-alpha" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: lower-alpha" %)
+* item 1
+* item 2
+)))
+|Uppercase Alphabetical list|((({{{
+(% style="list-style-type: upper-alpha" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: upper-alpha" %)
+* item 1
+* item 2
+)))
+|Lowercase Roman list|((({{{
+(% style="list-style-type: lower-roman" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: lower-roman" %)
+* item 1
+* item 2
+)))
+|Uppercase Roman list|((({{{
+(% style="list-style-type: upper-roman" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: upper-roman" %)
+* item 1
+* item 2
+)))
+|Lowercase Greek list|((({{{
+(% style="list-style-type: lower-greek" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: lower-greek" %)
+* item 1
+* item 2
+)))
+|Uppercase Greek list|((({{{
+(% style="list-style-type: upper-greek" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: upper-greek" %)
+* item 1
+* item 2
+)))
+|Hiragana list|((({{{
+(% style="list-style-type: hiragana" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: hiragana" %)
+* item 1
+* item 2
+)))
+|Hiragana Iroha list|((({{{
+(% style="list-style-type: hiragana-iroha" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: hiragana-iroha" %)
+* item 1
+* item 2
+)))
+|Katakana list|((({{{
+(% style="list-style-type: katakana" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: katakana" %)
+* item 1
+* item 2
+)))
+|Katakana Iroha list|((({{{
+(% style="list-style-type: katakana-iroha" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: katakana-iroha" %)
+* item 1
+* item 2
+)))
+|Armenian list|((({{{
+(% style="list-style-type: armenian" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: armenian" %)
+* item 1
+* item 2
+)))
+|Hebrew list|((({{{
+(% style="list-style-type: hebrew" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: hebrew" %)
+* item 1
+* item 2
+)))
+|Georgian list|((({{{
+(% style="list-style-type: georgian" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: georgian" %)
+* item 1
+* item 2
+)))
+|CJK ideographic list|((({{{
+(% style="list-style-type: cjk-ideographic" %)
+* item 1
+* item 2
+}}})))|(((
+(% style="list-style-type: cjk-ideographic" %)
+* item 1
+* item 2
 )))</content>
 </xwikidoc>

From e53ea0eba65f75ed17cb206468cb153f323773ec Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:49:40 +0000
Subject: [PATCH 122/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxScripts
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxscripts/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxScripts.uk.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxScripts.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxScripts.uk.xml
index b2063a1b1d5a..327bddc086a5 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxScripts.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxScripts.uk.xml
@@ -43,7 +43,7 @@
 
 == Скрипти ==
 
-=== Скрипти 1.0 ===
+=== 1.0 Scripts ===
 
 {{info}}У XWiki Syntax 1.0 можна було вводити скрипти Velocity будь-де безпосередньо на сторінці. Це може призвести до проблем, наприклад, коли користувач мимоволі вводив вміст Velocity. Він також потребує продуктивності для сторінок, які не потребують вмісту Velocity. Існує кілька інших технічних обмежень. Те ж саме стосується введення скриптів Groovy.{{/info}}
 
@@ -57,7 +57,7 @@ def var = "whatever"
 %&gt;
 }}})))
 
-=== Скрипти 2.0 ===
+=== 2.0 Scripts ===
 
 {{info}}XWiki [[підтримує кілька мов сценаріїв&gt;&gt;https://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/Scripting/]].{{/info}}
 

From e24bda6aaf0bcecab93a36df722216c6678c8477 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:20:57 +0000
Subject: [PATCH 123/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxTextFormatting
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxtextformatting/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxTextFormatting.uk.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.uk.xml
index 89e7fd3e62cf..5d9d522140a1 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.uk.xml
@@ -43,7 +43,7 @@
 
 == Форматування тексту ==
 
-=== Форматування тексту 1.0 ===
+=== 1.0 Text Formatting ===
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Жирний|{{{*жирний*}}}|**жирний**
@@ -54,7 +54,7 @@
 |Верхній індекс|якийсь &lt;sup&gt;верхній індекс&lt;/sup&gt;|якийсь ^^верхній індекс^^
 |Нижній індекс|якийсь &lt;sub&gt;нижній індекс&lt;/sub&gt;|якийсь ,,нижній індекс,,
 
-=== 2.0 Форматування тексту ===
+=== 2.0 Text Formatting ===
 
 |=Функція|=Синтаксис XWiki {{velocity}}$crtSyntaxVer{{/velocity}}|=Результат
 |Жирний|{{{**жирний**}}}|**жирний**

From c936c28bbf3addb34f65201a0b7081d0a9d261f6 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:11:00 +0000
Subject: [PATCH 124/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxGeneralRemarks
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxgeneralremarks/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxGeneralRemarks.uk.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGeneralRemarks.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGeneralRemarks.uk.xml
index 873b0ac80626..9f33bb9fc00d 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGeneralRemarks.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGeneralRemarks.uk.xml
@@ -43,7 +43,7 @@
 
 == Загальні зауваження ==
 
-=== Загальні зауваження 2.0 ===
+=== 2.0 General Remarks ===
 
 Синтаксис XWiki {{velocity}}$crtSyntaxVer{{/velocity}} виправляє деякі помилки або неоднозначний синтаксис, введений користувачем, як показано в прикладах у таблиці нижче.
 

From 3e9664eb28528ca494ac0a89319e998102675f62 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:38:53 +0000
Subject: [PATCH 125/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxQuotations
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxquotations/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxQuotations.uk.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxQuotations.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxQuotations.uk.xml
index 7996e5968cbb..34d8322d0f7b 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxQuotations.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxQuotations.uk.xml
@@ -43,7 +43,7 @@
 
 == Цитати ==
 
-=== Цитати 1.0 ===
+=== 1.0 Quotations ===
 
 Дозволяє процитувати деякий текст.
 
@@ -66,7 +66,7 @@
 Я сказав добре
 )))
 
-=== Цитати 2.0 ===
+=== 2.0 Quotations ===
 
 Дозволяє процитувати деякий текст.
 

From f471c180f905a512568725a9b56853ddd34ae9b5 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:29:13 +0000
Subject: [PATCH 126/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxNewLineLineBreaks
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxnewlinelinebreaks/uk/
---
 .../main/resources/XWiki/XWikiSyntaxNewLineLineBreaks.uk.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxNewLineLineBreaks.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxNewLineLineBreaks.uk.xml
index b8006603e81c..da1be20f9e25 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxNewLineLineBreaks.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxNewLineLineBreaks.uk.xml
@@ -43,7 +43,7 @@
 
 == Новий рядок/Розриви рядка ==
 
-=== Нові розриви рядків 1.0 ===
+=== 1.0 New Line Line Breaks ===
 
 Новий рядок - це символ повернення каретки. Розрив рядка — це примусовий новий рядок, який може з’явитися будь-де в тексті.
 
@@ -55,7 +55,7 @@
 |Розрив рядка|{{{Рядок\\Новий рядок}}}|Рядок\\Новий рядок
 |Новий рядок|Рядок\\Новий рядок|Новий рядок
 
-=== Нові розриви рядків 2.0 ===
+=== 2.0 New Line Line Breaks ===
 
 Новий рядок - це символ повернення каретки. Розрив рядка — це примусовий новий рядок, який може з’явитися будь-де в тексті.
 

From 93f521551a9d2ea07c616611c721d30db6360cb3 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:33:13 +0000
Subject: [PATCH 127/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxTables
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxtables/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxTables.uk.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTables.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTables.uk.xml
index 057757b35ec3..c6815a6c2d35 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTables.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTables.uk.xml
@@ -43,7 +43,7 @@
 
 == Таблиці ==
 
-=== Таблиці 1.0 ===
+=== 1.0 Tables ===
 
 Дозволяє легко створювати вміст у форматі таблиці.
 
@@ -107,7 +107,7 @@ $xwiki.jsfx.use("js/xwiki/table/tablefilterNsort.js", true)
 |Комірка 21|Комірка 22
 )))
 
-=== Таблиці 2.0 ===
+=== 2.0 Tables ===
 
 Дозволяє легко створювати вміст у форматі таблиці. Параметри для таблиці, рядка чи комірки також підтримуються в XWiki Syntax {{velocity}}$crtSyntaxVer{{/velocity}}.
 

From 2cffa515ac056434ba818bc31d1cd2da84251280 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:46:43 +0000
Subject: [PATCH 128/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxMacros
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxmacros/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxMacros.uk.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxMacros.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxMacros.uk.xml
index d7e805595f20..0bb657e40236 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxMacros.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxMacros.uk.xml
@@ -43,7 +43,7 @@
 
 == Макроси ==
 
-=== Макроси 1.0 ===
+=== 1.0 Macros ===
 
 У XWiki Syntax 1.0 є два типи макросів:
 
@@ -65,7 +65,7 @@
 }}}
 )))
 
-=== Макроси 2.0 ===
+=== 2.0 Macros ===
 
 У синтаксисі XWiki є лише один тип макросу {{velocity}}$crtSyntaxVer{{/velocity}}, який викликається за допомогою синтаксису: ##{{{{{macroname param1="value1" ... paramN=" valueN"}}...{{/macroname}}}}}##. Для макросів без вмісту є коротке позначення: ##{{{{{macroname param1="value1" ... paramN="valueN"/}}}}}##
 

From 26e40bbf5815a32644ffeec518bc24b0de4bd4d8 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:41:10 +0000
Subject: [PATCH 129/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxGroups
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxgroups/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxGroups.uk.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGroups.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGroups.uk.xml
index 7f67c3d62469..ddda5a90a95f 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGroups.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxGroups.uk.xml
@@ -43,7 +43,7 @@
 
 == Групи ==
 
-=== Групи 2.0 ===
+=== 2.0 Groups ===
 
 Групи можна використовувати, щоб вставити інший документ у рядок безпосередньо в поточний. Це дозволяє, наприклад, вставляти складні елементи або стилі всередину елемента списку, клітинки таблиці чи абзацу. Групи розділені такими синтаксичними елементами: ##{{{(((...)))}}}##. Одна група може містити іншу групу, і немає жодних обмежень на вкладеність.
 

From d0917767fceb9906c4b7519e15d65efb7d69eac1 Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:31:54 +0000
Subject: [PATCH 130/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxLinks
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaxlinks/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxLinks.uk.xml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLinks.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLinks.uk.xml
index 23efab592f1f..cad2fb54b7d1 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLinks.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLinks.uk.xml
@@ -40,7 +40,7 @@
 
 == Посилання ==
 
-=== Посилання 1.0 ===
+=== 1.0 Links ===
 
 |=(% style="width:20%" %)Функція|=Синтаксис XWiki 1.0|=(% style="width:20%" %)Результат
 |Посилання на сторінку в поточному просторі|{{{[WebHome]}}}|[[Web Home&gt;&gt;WebHome]]
@@ -98,7 +98,7 @@
 * **##interWikiAlias##**:Необов'язковий [[Inter Wiki&gt;&gt;https://en.wikipedia.org/wiki/InterWiki]] псевдонім, що визначено на карті InterWiki (Детальніше [[Admin Guide&gt;&gt;https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/]]). Це дійсне лише для назв вікі-сторінок. Наприклад: ##wikipedia##
 * **##parameters##**: Необов'язковий список параметрів, що передаються за посиланням. Наприклад: ##target="~_blank"## (відкрити в новому вікні)
 
-=== Посилання 2.1 ===
+=== 2.1 Links ===
 
 |=Функція|=Синтаксис XWiki 2.1|=Результат
 |Абсолютне посилання на сторінку ##PageB## розташованій у ##PageA##|{{{[[PageA.PageB]]}}}|[[PageB&gt;&gt;]]

From c5e5d7f60b398b6b6cf354a12652054cf30188eb Mon Sep 17 00:00:00 2001
From: hongsikum <redums@naver.com>
Date: Tue, 6 Feb 2024 08:27:48 +0000
Subject: [PATCH 131/143] Translated using Weblate (Korean)

Currently translated at 100.0% (85 of 85 strings)

Translation: XWiki Platform/LiveData - Macro
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/livedata-macro/ko/
---
 .../resources/ApplicationResources_ko.properties     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ko.properties b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ko.properties
index f538f5e25088..18894b0837bd 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ko.properties
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/ApplicationResources_ko.properties
@@ -47,6 +47,8 @@ rendering.macro.liveData.parameter.showPageSizeDropdown.name=\uD398\uC774\uC9C0
 rendering.macro.liveData.parameter.showPageSizeDropdown.description=\uC0AC\uC6A9\uC790\uAC00 \uD398\uC774\uC9C0\uB2F9 \uD45C\uC2DC\uB418\uB294 \uD56D\uBAA9 \uC218\uB97C \uBCC0\uACBD\uD560 \uC218 \uC788\uB294 \uD398\uC774\uC9C0 \uD06C\uAE30 \uB4DC\uB86D\uB2E4\uC6B4\uC744 \uD45C\uC2DC\uD558\uAC70\uB098 \uC228\uAE41\uB2C8\uB2E4 .
 rendering.macro.liveData.parameter.pageSizes.name=\uD398\uC774\uC9C0 \uD06C\uAE30
 rendering.macro.liveData.parameter.pageSizes.description=\uD398\uC774\uC9C0 \uD06C\uAE30 \uB4DC\uB86D\uB2E4\uC6B4\uC5D0 \uD45C\uC2DC\uD560 \uD398\uC774\uC9C0 \uD06C\uAE30\uC758 \uC27C\uD45C\uB85C \uAD6C\uBD84\uB41C \uBAA9\uB85D\uC785\uB2C8\uB2E4.
+rendering.macro.liveData.parameter.description.name=\uC124\uBA85
+rendering.macro.liveData.parameter.description.description=\uB77C\uC774\uBE0C \uB370\uC774\uD130\uC5D0 \uB300\uD55C \uC120\uD0DD\uC801 \uD14D\uC2A4\uD2B8 \uC124\uBA85\uC785\uB2C8\uB2E4.
 
 #
 # Translation keys for the live data widget.
@@ -76,8 +78,9 @@ livedata.pagination.next=\uB2E4\uC74C \uD398\uC774\uC9C0
 livedata.pagination.last=\uB9C8\uC9C0\uB9C9 \uD398\uC774\uC9C0
 livedata.action.refresh=\uC0C8\uB85C \uACE0\uCE58\uB2E4
 livedata.action.addEntry=\uD56D\uBAA9 \uCD94\uAC00
-livedata.action.reorder.hint=\uB4DC\uB798\uADF8\uD558\uC5EC \uC7AC\uC815\uB82C\uD558\uC138\uC694
-livedata.action.resizeColumn.hint=\uD06C\uAE30\uB97C \uC870\uC815\uD558\uB824\uBA74 \uB4DC\uB798\uADF8\uD558\uC138\uC694. \uC7AC\uC124\uC815\uD558\uB824\uBA74 \uB450 \uBC88 \uD074\uB9AD\uD558\uC138\uC694.
+livedata.action.columnName.default.hint=\uC774 \uC18D\uC131\uC744 \uC7AC\uC815\uB82C\uD558\uB824\uBA74 \uB4DC\uB798\uADF8\uD558\uAC70\uB098 \uD654\uC0B4\uD45C \uD0A4\uB97C \uC0AC\uC6A9\uD558\uC138\uC694.
+livedata.action.columnName.sortable.hint=\uC774 \uC18D\uC131\uC744 \uAE30\uC900\uC73C\uB85C \uD56D\uBAA9\uC744 \uC815\uB82C\uD558\uB824\uBA74 \uD074\uB9AD\uD558\uC138\uC694 . \uC7AC\uC815\uB82C\uD558\uB824\uBA74 \uB4DC\uB798\uADF8\uD558\uAC70\uB098 \uD654\uC0B4\uD45C \uD0A4\uB97C \uC0AC\uC6A9\uD558\uC138\uC694.
+livedata.action.resizeColumn.hint=\uACAC\uC778\uB610\uB294 \uD654\uC0B4\uD45C \uD0A4\uB97C \uC0AC\uC6A9\uD558\uC138\uC694. \uD06C\uAE30\uB97C \uC870\uC815\uD569\uB2C8\uB2E4. \uB354\uBE14 \uD074\uB9AD\uC544\uB2C8\uBA74 \uD0C8\uCD9C\uC744 \uB204\uB974\uC138\uC694\uC7AC\uC124\uC815\uD569\uB2C8\uB2E4.
 livedata.panel.filter.title=\uD544\uD130
 livedata.panel.filter.noneFilterable=\uD45C\uC2DC\uB41C \uC18D\uC131 \uC911 \uD544\uD130\uB9C1\uD560 \uC218 \uC788\uB294 \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
 livedata.panel.filter.addConstraint=\uC81C\uC57D\uC870\uAC74 \uCD94\uAC00
@@ -109,3 +112,8 @@ livedata.footnotes.computedTitle=\uC77C\uBD80 \uD398\uC774\uC9C0\uC5D0\uB294 \uA
 livedata.footnotes.propertyNotViewable=\uC77C\uBD80 \uD56D\uBAA9\uC744 \uBCF4\uB824\uBA74 \uD2B9\uBCC4\uD55C \uAD8C\uD55C\uC774 \uD544\uC694\uD558\uBBC0\uB85C \uD574\uB2F9 \uD56D\uBAA9\uC5D0\uC11C \uD544\uB4DC\uB97C \uCD94\uCD9C\uD560 \uC218 \uC5C6\uB294 \uACBD\uC6B0 \uD45C\uC2DC\uB429\uB2C8\uB2E4.
 livedata.bottombar.noEntries=\uD56D\uBAA9 \uC5C6\uC74C )
 livedata.error.updateEntriesFailed=\uC54C \uC218 \uC5C6\uB294 \uC774\uC720\uB85C \uD56D\uBAA9\uC744 \uC5C5\uB370\uC774\uD2B8 \uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4.
+livedata.action.reorder.hint=\uB4DC\uB798\uADF8\uD558\uC5EC \uC7AC\uC815\uB82C\uD558\uC138\uC694
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
+

From ddbb6d62d273a15f517647898f15f7486f9cb55b Mon Sep 17 00:00:00 2001
From: Nikita Petrenko <petrenkonikserg@gmail.com>
Date: Tue, 6 Feb 2024 06:36:34 +0000
Subject: [PATCH 132/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2 of 2 strings)

Translation: XWiki Platform/XWiki.XWikiSyntaxImages
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-xwikisyntaximages/uk/
---
 .../src/main/resources/XWiki/XWikiSyntaxImages.uk.xml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
index a86a7337fb3e..efc0276f4257 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxImages.uk.xml
@@ -40,7 +40,7 @@
 
 == Зображення ==
 
-=== Зображення 1.0 ===
+=== 1.0 Images ===
 
 |=Функція|=Синтаксис XWiki 1.0|=Результат
 |Зображення з вкладення поточної сторінки|(((
@@ -51,7 +51,7 @@
 |Зображення з параметрами|{{{{image:img.png|width=25|height=25}}}}|[[image:XWiki.XWikiSyntaxImages@img.png||width="25" height="25"]]
 |Зображення, розташовані за URL|{{{https://some/url/img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
 
-=== Зображення 2.0 ===
+=== 2.0 Images ===
 
 |=Функція|=Синтаксис XWiki 2.0|=Результат
 |Зображення з вкладення поточної сторінки|{{{image:img.png}}}|image:XWiki.XWikiSyntaxImages@img.png
@@ -86,7 +86,7 @@ The full format of an image is either **##image~: (reference)##** or **##~[~[{ca
 *** **##alt##**: Параметр, який визначає, який текст має відображатися, якщо браузер не може відобразити зображення. Оскільки це обов'язковий HTML-атрибут, XWiki використовуватиме замість нього ім'я файлу, якщо параметр ##alt## не визначено. Наприклад: ##alt="img.png"##
 *** **More**: Детальніше пояснення HTML ##&lt;img&gt;## тегів, що містять більше атрибутів, можна переглянути [[HTML standard&gt;&gt;https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element]].
 
-=== Зображення 2.1 ===
+=== 2.1 Images ===
 
 |=Функція|=Синтаксис XWiki 2.1|=Результат
 |Зображення з вкладення поточної сторінки|{{{image:img.png}}}|image:XWiki.XWikiSyntaxImages@img.png

From ce4195f460fbce64d67d430d004241dbcaa224b6 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 9 Feb 2024 12:41:51 +0200
Subject: [PATCH 133/143] XWIKI-21855: Error in JS console when adding an
 annotation * It seem CKEditor throws an exception if you call getSelection()
 on a detached editor (which can happen after an annotation is added, because
 we remove the editor which triggers a blur event which triggers the focused
 placeholder listener).

---
 .../src/main/webjar/xwiki-focusedplaceholder/plugin.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js
index 68e89e1ccdee..3f5e79df6548 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js
@@ -149,8 +149,8 @@
        * @return the element that holds the caret and is empty, or undefined if no such element is present
        */
       function getFocusedEmptyBlock(editor) {
-        const selection = editor.getSelection();
-        if (selection?.isCollapsed() && editor.focusManager.hasFocus) {
+        const selection = !editor.isDetached() && editor.getSelection();
+        if (selection?.isCollapsed?.() && editor.focusManager.hasFocus) {
           const container = selection.getRanges()[0].startContainer;
           // Check first if the container itself is empty, in order to reduce the computations, since this method is
           // called whenever the user types (and most of the time the caret is inside a text node that is not empty).

From 439f71ba0808d917e70e4e883330b6f593f2afef Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 9 Feb 2024 12:45:08 +0200
Subject: [PATCH 134/143] XWIKI-21854: Endless spinning wheel displayed in some
 cases when adding an annotation * Don't trigger the blur event on editors
 that have been detached from the DOM (which happens for instance when an
 annotation is added).

---
 .../src/main/webjar/xwiki-save/plugin.js                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js
index 2f665a1252c1..79284e809fd7 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js
@@ -82,7 +82,7 @@
               // reset the dirty flag and the moment we leave the edit mode, which will trigger the leave confirmation,
               // unexpectedly. In order to overcome this we have to force the editor to lose focus immediately if the
               // focus manager has a blur timer started (meaning that a blur is scheduled).
-              if (editor.focusManager?.hasFocus && editor.focusManager?._?.timer) {
+              if (!editor.isDetached() && editor.focusManager?.hasFocus && editor.focusManager?._?.timer) {
                 editor.focusManager.blur(true);
               }
               editor.resetDirty();

From 7b62e9dac95ec81db092b981cf8709adc16fdf40 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 9 Feb 2024 12:47:37 +0200
Subject: [PATCH 135/143] [misc] Indicate in the POM that we bundle the
 CKEditor code.

---
 .../xwiki-platform-ckeditor-webjar/pom.xml                   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
index 16929b2b7370..39a78199171c 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
@@ -36,6 +36,11 @@
     <xwiki.extension.name>CKEditor WebJar</xwiki.extension.name>
     <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-webjar</xwiki.extension.features>
+    <!-- We bundle the CKEditor code. -->
+    <xwiki.extension.features>org.webjars:ckeditor</xwiki.extension.features>
+    <xwiki.extension.features>org.webjars.npm:ckeditor</xwiki.extension.features>
+    <!-- See https://www.npmjs.com/package/ckeditor4 -->
+    <xwiki.extension.features>ckeditor4</xwiki.extension.features>
 
     <!-- The path to the folder where we clone the CKEditor sources. -->
     <ckeditor.path>${project.build.directory}/ckeditor4-${ckeditor.version}</ckeditor.path>

From d9fc599120158ca87595ec9bb1d6129406682a57 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 9 Feb 2024 13:23:26 +0200
Subject: [PATCH 136/143] [misc] Fix the xwiki.extension.features and also
 indicate the previous extension id.

---
 .../xwiki-platform-ckeditor-plugins/pom.xml   |  2 ++
 .../xwiki-platform-ckeditor-ui/pom.xml        |  7 +++++--
 .../xwiki-platform-ckeditor-webjar/pom.xml    | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
index 48e2a93d613d..a670b473dbfa 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
@@ -34,6 +34,8 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor Plugins for XWiki</xwiki.extension.name>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-plugins</xwiki.extension.previousIds>
     <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-plugins</xwiki.extension.features>
   </properties>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
index d88d1dde0c85..db37ca4067dd 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
@@ -34,10 +34,13 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor Integration</xwiki.extension.name>
-    <!-- Don't run Revapi here because there's no Java code. -->
-    <xwiki.revapi.skip>true</xwiki.revapi.skip>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-ui</xwiki.extension.previousIds>
     <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-ui</xwiki.extension.features>
+
+    <!-- Don't run Revapi here because there's no Java code. -->
+    <xwiki.revapi.skip>true</xwiki.revapi.skip>
   </properties>
 
   <dependencies>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
index 39a78199171c..e9ea8299c252 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
@@ -34,13 +34,18 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor WebJar</xwiki.extension.name>
-    <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
-    <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-webjar</xwiki.extension.features>
-    <!-- We bundle the CKEditor code. -->
-    <xwiki.extension.features>org.webjars:ckeditor</xwiki.extension.features>
-    <xwiki.extension.features>org.webjars.npm:ckeditor</xwiki.extension.features>
-    <!-- See https://www.npmjs.com/package/ckeditor4 -->
-    <xwiki.extension.features>ckeditor4</xwiki.extension.features>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-webjar</xwiki.extension.previousIds>
+    <!-- The list of extensions that this module either replaces or bundles:
+      * this module replaces the CKEditor Integration WebJar extension from XWiki Contrib
+      * this module bundles the CKEditor code (so it can be seen as a replacement for both the CKEditor default WebJar
+        and the CKEditor node module) -->
+    <xwiki.extension.features>
+      org.xwiki.contrib:application-ckeditor-webjar,
+      org.webjars:ckeditor/${ckeditor.version},
+      org.webjars.npm:ckeditor/${ckeditor.version},
+      ckeditor4/${ckeditor.version}
+    </xwiki.extension.features>
 
     <!-- The path to the folder where we clone the CKEditor sources. -->
     <ckeditor.path>${project.build.directory}/ckeditor4-${ckeditor.version}</ckeditor.path>

From e5e3872becec4b06c43513b5624c2528bc36157f Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 9 Feb 2024 15:33:35 +0100
Subject: [PATCH 137/143] [Misc] Fix missing extension category metadata

---
 .../xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
index aa1d8a801278..626f9ba71a08 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
@@ -34,6 +34,8 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>Font Awesome Icon Theme</xwiki.extension.name>
+    <!-- Category to display in the Extension Manager -->
+    <xwiki.extension.category>icontheme</xwiki.extension.category>
     <!-- Old names of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>
     <!-- only used in 6.2M1 -->

From 78c97071d2f41809c3a2090d658e9fa9fac63530 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 9 Feb 2024 16:15:46 +0100
Subject: [PATCH 138/143] [Misc] Move 2 tests to JUnit5

---
 .../PathWikiReferenceExtractorTest.java       | 69 ++++++++++---------
 ...dedURLResourceReferenceSerializerTest.java | 51 +++++++-------
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/PathWikiReferenceExtractorTest.java b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/PathWikiReferenceExtractorTest.java
index f35d9fd11d40..a530f5e9ba7c 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/PathWikiReferenceExtractorTest.java
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/PathWikiReferenceExtractorTest.java
@@ -21,18 +21,19 @@
 
 import java.net.URL;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.xwiki.context.Execution;
 import org.xwiki.context.ExecutionContext;
 import org.xwiki.model.reference.WikiReference;
-import org.xwiki.test.mockito.MockitoComponentMockingRule;
+import org.xwiki.test.junit5.mockito.ComponentTest;
+import org.xwiki.test.junit5.mockito.InjectMockComponents;
+import org.xwiki.test.junit5.mockito.MockComponent;
 import org.xwiki.url.ExtendedURL;
 import org.xwiki.wiki.descriptor.WikiDescriptor;
 import org.xwiki.wiki.descriptor.WikiDescriptorManager;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
 
 /**
@@ -41,78 +42,81 @@
  * @version $Id$
  * @since 6.3M1
  */
-public class PathWikiReferenceExtractorTest
+@ComponentTest
+class PathWikiReferenceExtractorTest
 {
-    @Rule
-    public MockitoComponentMockingRule<PathWikiReferenceExtractor> mocker =
-        new MockitoComponentMockingRule<>(PathWikiReferenceExtractor.class);
+    @InjectMockComponents
+    private PathWikiReferenceExtractor extractor;
 
+    @MockComponent
     private WikiDescriptorManager wikiDescriptorManager;
 
-    @Before
-    public void setUp() throws Exception
+    @MockComponent
+    private Execution execution;
+
+    @MockComponent
+    private StandardURLConfiguration urlConfiguration;
+
+    @BeforeEach
+    void setUp() throws Exception
     {
-        this.wikiDescriptorManager = mocker.getInstance(WikiDescriptorManager.class);
-        when(wikiDescriptorManager.getMainWikiId()).thenReturn("xwiki");
+        when(this.wikiDescriptorManager.getMainWikiId()).thenReturn("xwiki");
     }
 
     @Test
-    public void extractWhenWikiDescriptor() throws Exception
+    void extractWhenWikiDescriptor() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.REDIRECT_TO_MAIN_WIKI);
 
-        WikiDescriptorManager wikiDescriptorManager = mocker.getInstance(WikiDescriptorManager.class);
-        when(wikiDescriptorManager.getByAlias("someWiki")).thenReturn(new WikiDescriptor("wikiid", "someWiki"));
+        when(this.wikiDescriptorManager.getByAlias("someWiki")).thenReturn(new WikiDescriptor("wikiid", "someWiki"));
 
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "wikiid");
     }
 
     @Test
-    public void extractWhenNoWikiDescriptor() throws Exception
+    void extractWhenNoWikiDescriptor() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.REDIRECT_TO_MAIN_WIKI);
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "xwiki");
     }
 
     @Test
-    public void extractWhenWikiDescriptorButEmptyServerName() throws Exception
+    void extractWhenWikiDescriptorButEmptyServerName() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.REDIRECT_TO_MAIN_WIKI);
 
-        WikiDescriptorManager wikiDescriptorManager = mocker.getInstance(WikiDescriptorManager.class);
-        when(wikiDescriptorManager.getByAlias("someWiki")).thenReturn(new WikiDescriptor("", "someWiki"));
+        when(this.wikiDescriptorManager.getByAlias("someWiki")).thenReturn(new WikiDescriptor("", "someWiki"));
 
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "xwiki");
     }
 
     @Test
-    public void extractWhenNoDescriptorMatchingAliasButDescriptorMatchingId() throws Exception
+    void extractWhenNoDescriptorMatchingAliasButDescriptorMatchingId() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.REDIRECT_TO_MAIN_WIKI);
 
-        WikiDescriptorManager wikiDescriptorManager = mocker.getInstance(WikiDescriptorManager.class);
-        when(wikiDescriptorManager.getByAlias("someWiki")).thenReturn(null);
-        when(wikiDescriptorManager.getById("someWiki")).thenReturn(new WikiDescriptor("dummy", "dummy"));
+        when(this.wikiDescriptorManager.getByAlias("someWiki")).thenReturn(null);
+        when(this.wikiDescriptorManager.getById("someWiki")).thenReturn(new WikiDescriptor("dummy", "dummy"));
 
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "somewiki");
     }
 
     @Test
-    public void extractWhenNoWikiDescriptorButWithDomainBasedURL() throws Exception
+    void extractWhenNoWikiDescriptorButWithDomainBasedURL() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.REDIRECT_TO_MAIN_WIKI);
         testAndAssert("http://wiki.server.com/xwiki/bin/view/Main/WebHome", "xwiki");
     }
 
     @Test
-    public void extractWhenNoWikiDescriptorAndDisplayErrorWhenWikiNotFound() throws Exception
+    void extractWhenNoWikiDescriptorAndDisplayErrorWhenWikiNotFound() throws Exception
     {
         setUpConfiguration(WikiNotFoundBehavior.DISPLAY_ERROR);
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "somewiki");
     }
 
     @Test
-    public void extractWhenNoExecutionContext() throws Exception
+    void extractWhenNoExecutionContext() throws Exception
     {
         testAndAssert("http://localhost/xwiki/wiki/someWiki/view/Main/WebHome", "somewiki");
 
@@ -125,19 +129,16 @@ private void testAndAssert(String urlToTest, String expectedWikiId) throws Excep
         ExtendedURL url = new ExtendedURL(new URL(urlToTest), "xwiki");
         // Remove the resource type (i.e. the first segment) since this is what is expected by the extractor
         url.getSegments().remove(0);
-        WikiReference wikiReference = this.mocker.getComponentUnderTest().extract(url);
+        WikiReference wikiReference = this.extractor.extract(url);
         assertEquals(new WikiReference(expectedWikiId), wikiReference);
     }
 
-    private void setUpConfiguration(WikiNotFoundBehavior wikiNotFoundBehavior) throws Exception
+    private void setUpConfiguration(WikiNotFoundBehavior wikiNotFoundBehavior)
     {
         // Simulate a configured Execution Context
-        Execution execution = mocker.getInstance(Execution.class);
         ExecutionContext executionContext = new ExecutionContext();
         executionContext.setProperty("xwikicontext", true);
-        when(execution.getContext()).thenReturn(executionContext);
-
-        StandardURLConfiguration urlConfiguration = mocker.getInstance(StandardURLConfiguration.class);
-        when(urlConfiguration.getWikiNotFoundBehavior()).thenReturn(wikiNotFoundBehavior);
+        when(this.execution.getContext()).thenReturn(executionContext);
+        when(this.urlConfiguration.getWikiNotFoundBehavior()).thenReturn(wikiNotFoundBehavior);
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/StandardExtendedURLResourceReferenceSerializerTest.java b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/StandardExtendedURLResourceReferenceSerializerTest.java
index 45bc91da00b1..1f387fdc9e1e 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/StandardExtendedURLResourceReferenceSerializerTest.java
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/src/test/java/org/xwiki/url/internal/standard/StandardExtendedURLResourceReferenceSerializerTest.java
@@ -19,8 +19,9 @@
  */
 package org.xwiki.url.internal.standard;
 
-import org.junit.Rule;
-import org.junit.Test;
+import javax.inject.Named;
+
+import org.junit.jupiter.api.Test;
 import org.xwiki.component.manager.ComponentLookupException;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.util.DefaultParameterizedType;
@@ -28,11 +29,13 @@
 import org.xwiki.resource.ResourceReferenceSerializer;
 import org.xwiki.resource.ResourceType;
 import org.xwiki.resource.UnsupportedResourceReferenceException;
-import org.xwiki.test.mockito.MockitoComponentMockingRule;
+import org.xwiki.test.junit5.mockito.ComponentTest;
+import org.xwiki.test.junit5.mockito.InjectMockComponents;
+import org.xwiki.test.junit5.mockito.MockComponent;
 import org.xwiki.url.ExtendedURL;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
 /**
@@ -41,11 +44,15 @@
  * @version $Id$
  * @since 6.1M2
  */
-public class StandardExtendedURLResourceReferenceSerializerTest
+@ComponentTest
+class StandardExtendedURLResourceReferenceSerializerTest
 {
-    @Rule
-    public MockitoComponentMockingRule<StandardExtendedURLResourceReferenceSerializer> mocker =
-        new MockitoComponentMockingRule<>(StandardExtendedURLResourceReferenceSerializer.class);
+    @InjectMockComponents
+    private StandardExtendedURLResourceReferenceSerializer serializer;
+
+    @MockComponent
+    @Named("context")
+    private ComponentManager componentManager;
 
     public class TestResourceReference extends AbstractResourceReference
     {
@@ -56,41 +63,37 @@ public TestResourceReference()
     }
 
     @Test
-    public void serialize() throws Exception
+    void serialize() throws Exception
     {
         TestResourceReference resource = new TestResourceReference();
 
         ResourceReferenceSerializer serializer = mock(ResourceReferenceSerializer.class);
 
-        ComponentManager componentManager = this.mocker.getInstance(ComponentManager.class, "context");
-        when(componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
+        when(this.componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
             TestResourceReference.class, ExtendedURL.class), "standard")).thenReturn(serializer);
 
-        this.mocker.getComponentUnderTest().serialize(resource);
+        this.serializer.serialize(resource);
 
         // Verify the serializer is called and with the proper parameters
         verify(serializer).serialize(same(resource));
     }
 
     @Test
-    public void serializeWhenNoMatchingSerializer() throws Exception
+    void serializeWhenNoMatchingSerializer() throws Exception
     {
         TestResourceReference resource = new TestResourceReference();
 
-        ComponentManager componentManager = this.mocker.getInstance(ComponentManager.class, "context");
-        when(componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
+        when(this.componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
             TestResourceReference.class, ExtendedURL.class), "standard")).thenThrow(
                 new ComponentLookupException("error"));
-        when(componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
+        when(this.componentManager.getInstance(new DefaultParameterizedType(null, ResourceReferenceSerializer.class,
             TestResourceReference.class, ExtendedURL.class))).thenThrow(
             new ComponentLookupException("error"));
 
-        try {
-            this.mocker.getComponentUnderTest().serialize(resource);
-            fail("Should have thrown an exception here");
-        } catch (UnsupportedResourceReferenceException expected) {
-            assertEquals("Failed to find serializer for Resource Reference [type = [test], parameters = []] and "
-                + "URL format [standard]", expected.getMessage());
-        }
+        Throwable exception = assertThrows(UnsupportedResourceReferenceException.class, () -> {
+            this.serializer.serialize(resource);
+        });
+        assertEquals("Failed to find serializer for Resource Reference [type = [test], parameters = []] and "
+            + "URL format [standard]", exception.getMessage());
     }
 }
\ No newline at end of file

From 5e10fb9d595c9cec79ae8a45faffdc56443d6424 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Fri, 9 Feb 2024 18:07:04 +0200
Subject: [PATCH 139/143] XWIKI-21763: Disable the server-side image resizing
 while exporting to PDF * Using a workaround until we add support for
 temporarily overwrite properties from a configuration source. * Small
 refactoring of PDFExportJob to reduce class-fan-out complexity

---
 .../internal/job/AbstractPDFExportJob.java    | 89 +++++++++++++++++++
 .../export/pdf/internal/job/PDFExportJob.java | 56 +-----------
 .../PDFExportIT/Parent/Child/WebHome.xml      | 10 ++-
 .../pom.xml                                   |  7 ++
 .../org/xwiki/export/pdf/test/ui/AllIT.java   |  3 +-
 .../xwiki/export/pdf/test/ui/PDFExportIT.java | 16 +++-
 .../main/resources/XWiki/PDFExport/Sheet.xml  | 32 +++++++
 .../XWiki/PDFExport/Translations.ko.xml       |  2 +-
 8 files changed, 154 insertions(+), 61 deletions(-)
 create mode 100644 xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/AbstractPDFExportJob.java

diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/AbstractPDFExportJob.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/AbstractPDFExportJob.java
new file mode 100644
index 000000000000..ce86d3d9e19d
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/AbstractPDFExportJob.java
@@ -0,0 +1,89 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.export.pdf.internal.job;
+
+import java.util.Arrays;
+
+import javax.inject.Inject;
+
+import org.xwiki.export.pdf.job.PDFExportJobRequest;
+import org.xwiki.export.pdf.job.PDFExportJobStatus;
+import org.xwiki.job.AbstractJob;
+import org.xwiki.job.GroupedJob;
+import org.xwiki.job.JobGroupPath;
+import org.xwiki.model.reference.EntityReference;
+import org.xwiki.security.authorization.AuthorizationManager;
+import org.xwiki.security.authorization.Right;
+
+/**
+ * Base class for PDF export job.
+ * 
+ * @version $Id$
+ */
+public abstract class AbstractPDFExportJob extends AbstractJob<PDFExportJobRequest, PDFExportJobStatus>
+    implements GroupedJob
+{
+    /**
+     * The PDF export job type.
+     */
+    public static final String JOB_TYPE = "export/pdf";
+
+    /**
+     * Used to check access permissions.
+     * 
+     * @see #hasAccess(Right, EntityReference)
+     */
+    @Inject
+    private AuthorizationManager authorization;
+
+    @Override
+    public String getType()
+    {
+        return JOB_TYPE;
+    }
+
+    @Override
+    public JobGroupPath getGroupPath()
+    {
+        return new JobGroupPath(Arrays.asList("export", "pdf"));
+    }
+
+    @Override
+    protected PDFExportJobStatus createNewStatus(PDFExportJobRequest request)
+    {
+        return new PDFExportJobStatus(getType(), request, this.observationManager, this.loggerManager);
+    }
+
+    /**
+     * Check access rights taking into account the job request.
+     * 
+     * @param right the access right to check
+     * @param reference the target entity reference
+     * @return return {@code true} if the current user or the entity author have the specified access right on the
+     *         specified entity, depending on the job request
+     */
+    protected boolean hasAccess(Right right, EntityReference reference)
+    {
+        return ((!this.request.isCheckRights()
+            || this.authorization.hasAccess(right, this.request.getUserReference(), reference))
+            && (!this.request.isCheckAuthorRights()
+                || this.authorization.hasAccess(right, this.request.getAuthorReference(), reference)));
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/PDFExportJob.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/PDFExportJob.java
index 7f0a090b6a19..ff742a3e62f6 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/PDFExportJob.java
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/src/main/java/org/xwiki/export/pdf/internal/job/PDFExportJob.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -34,17 +33,11 @@
 import org.xwiki.export.pdf.PDFPrinter;
 import org.xwiki.export.pdf.internal.RequiredSkinExtensionsRecorder;
 import org.xwiki.export.pdf.job.PDFExportJobRequest;
-import org.xwiki.export.pdf.job.PDFExportJobStatus;
 import org.xwiki.export.pdf.job.PDFExportJobStatus.DocumentRenderingResult;
-import org.xwiki.job.AbstractJob;
-import org.xwiki.job.GroupedJob;
-import org.xwiki.job.JobGroupPath;
 import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.model.reference.EntityReference;
 import org.xwiki.model.reference.ObjectPropertyReference;
 import org.xwiki.model.reference.ObjectReference;
 import org.xwiki.resource.temporary.TemporaryResourceStore;
-import org.xwiki.security.authorization.AuthorizationManager;
 import org.xwiki.security.authorization.Right;
 
 /**
@@ -56,21 +49,8 @@
  */
 @Component
 @Named(PDFExportJob.JOB_TYPE)
-public class PDFExportJob extends AbstractJob<PDFExportJobRequest, PDFExportJobStatus> implements GroupedJob
+public class PDFExportJob extends AbstractPDFExportJob
 {
-    /**
-     * The PDF export job type.
-     */
-    public static final String JOB_TYPE = "export/pdf";
-
-    /**
-     * Used to check access permissions.
-     * 
-     * @see #hasAccess(Right, EntityReference)
-     */
-    @Inject
-    private AuthorizationManager authorization;
-
     @Inject
     private DocumentRenderer documentRenderer;
 
@@ -94,24 +74,6 @@ public class PDFExportJob extends AbstractJob<PDFExportJobRequest, PDFExportJobS
     @Inject
     private PrintPreviewURLBuilder printPreviewURLBuilder;
 
-    @Override
-    public String getType()
-    {
-        return JOB_TYPE;
-    }
-
-    @Override
-    public JobGroupPath getGroupPath()
-    {
-        return new JobGroupPath(Arrays.asList("export", "pdf"));
-    }
-
-    @Override
-    protected PDFExportJobStatus createNewStatus(PDFExportJobRequest request)
-    {
-        return new PDFExportJobStatus(getType(), request, this.observationManager, this.loggerManager);
-    }
-
     @Override
     protected void runInternal() throws Exception
     {
@@ -195,22 +157,6 @@ private int render(DocumentReference documentReference, DocumentRendererParamete
         return renderingResult.getHTML().length();
     }
 
-    /**
-     * Check access rights taking into account the job request.
-     * 
-     * @param right the access right to check
-     * @param reference the target entity reference
-     * @return return {@code true} if the current user or the entity author have the specified access right on the
-     *         specified entity, depending on the job request
-     */
-    private boolean hasAccess(Right right, EntityReference reference)
-    {
-        return ((!this.request.isCheckRights()
-            || this.authorization.hasAccess(right, this.request.getUserReference(), reference))
-            && (!this.request.isCheckAuthorRights()
-                || this.authorization.hasAccess(right, this.request.getAuthorReference(), reference)));
-    }
-
     private void saveAsPDF() throws IOException
     {
         URL printPreviewURL = this.printPreviewURLBuilder.getPrintPreviewURL(this.request);
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/src/main/resources/PDFExportIT/Parent/Child/WebHome.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/src/main/resources/PDFExportIT/Parent/Child/WebHome.xml
index 327222e06316..da67cdad7fcf 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/src/main/resources/PDFExportIT/Parent/Child/WebHome.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/src/main/resources/PDFExportIT/Parent/Child/WebHome.xml
@@ -40,7 +40,15 @@
 
 Content of first section.
 
-image:attach:xwiki-logo.png</content>
+[[image:attach:xwiki-logo.png||width="100"]]
+
+[[image:attach:xwiki-logo.png||width="100" class="force-server-side-resize"]]
+
+{{velocity}}
+{{html}}
+&lt;img src="$doc.getAttachmentURL('xwiki-logo.png', 'download', 'height=50')" alt="XWiki Logo" /&gt;
+{{/html}}
+{{/velocity}}</content>
   <attachment>
     <filename>xwiki-logo.png</filename>
     <mimetype>image/png</mimetype>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
index 45ac8df77bfb..70133083f16f 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
@@ -69,6 +69,13 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <!-- Needed to verify that image server-side resize is disabled while exporting to PDF. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-image-processing-plugin</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <!--Test only dependencies. -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
index f2a76b1cda04..24569481e85e 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
@@ -46,7 +46,8 @@
         // Starting or stopping the Office server requires PR (for the current user, on the main wiki reference).
         // Enabling debug logs also requires PR.
         "xwikiPropertiesAdditionalProperties=test.prchecker.excludePattern="
-            + ".*:(XWiki\\.OfficeImporterAdmin|PDFExportIT\\.EnableDebugLogs)"
+            + ".*:(XWiki\\.OfficeImporterAdmin|PDFExportIT\\.EnableDebugLogs)",
+        "xwikiCfgPlugins=com.xpn.xwiki.plugin.image.ImagePlugin",
     }
 )
 @ExtendWith(PDFExportExecutionCondition.class)
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
index ab8057748fe0..180b95ef2b33 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
@@ -81,7 +81,8 @@
         // Starting or stopping the Office server requires PR (for the current user, on the main wiki reference).
         // Enabling debug logs also requires PR.
         "xwikiPropertiesAdditionalProperties=test.prchecker.excludePattern="
-            + ".*:(XWiki\\.OfficeImporterAdmin|PDFExportIT\\.EnableDebugLogs)"
+            + ".*:(XWiki\\.OfficeImporterAdmin|PDFExportIT\\.EnableDebugLogs)",
+        "xwikiCfgPlugins=com.xpn.xwiki.plugin.image.ImagePlugin",
     }
 )
 @ExtendWith(PDFExportExecutionCondition.class)
@@ -225,11 +226,20 @@ void exportAsPDF(TestUtils setup, TestConfiguration testConfiguration) throws Ex
             assertTrue(contentPageText.contains("Child\nSection 1\nContent of first section.\n"),
                 "Child document content missing: " + contentPageText);
 
-            // The content of the child document shows an image.
+            // The content of the child document shows the same image multiple times.
             List<PDFImage> contentPageImages = pdf.getImagesFromPage(3);
-            assertEquals(1, contentPageImages.size());
+            assertEquals(3, contentPageImages.size());
+
+            // Verify the images included in the PDF are not resized server-side (we know the image width is specified
+            // in the source wiki syntax and we enabled the server-side image resize by default).
             assertEquals(512, contentPageImages.get(0).getRawWidth());
             assertEquals(512, contentPageImages.get(0).getRawHeight());
+            assertEquals(512, contentPageImages.get(2).getRawWidth());
+            assertEquals(512, contentPageImages.get(2).getRawHeight());
+
+            // For the second image we force the server-side resize.
+            assertEquals(100, contentPageImages.get(1).getRawWidth());
+            assertEquals(100, contentPageImages.get(1).getRawHeight());
         }
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Sheet.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Sheet.xml
index 329a765ce00e..55e2a14d203c 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Sheet.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Sheet.xml
@@ -822,6 +822,38 @@ require([
     }).wrap("&lt;span&gt;&lt;/span&gt;");
   };
 
+  /**
+   * Removes the image size (width and height) from the image URL query string in order to prevent the server-side
+   * resize of the image, thus allowing the full size image to be included in the generated PDF.
+   */
+  async function disableServerSideImageResize() {
+    const imageLoadPromises = []
+    document.querySelectorAll('#xwikicontent img:not(.force-server-side-resize)').forEach(image =&gt; {
+      const imageURL = new URL(image.src);
+      const imageParams = imageURL.searchParams;
+      if (imageParams.has('width') || imageParams.has('height')) {
+        // Backup the original query string before we modify the image URL.
+        const oldImageQueryString = imageURL.search;
+        // The image size is specified in the URL which may trigger a server-side resize. We want the full image to be
+        // included in the PDF so let's remove these parameters.
+        imageParams.delete('width');
+        imageParams.delete('height');
+        const newImageQueryString = '?' + imageParams.toString();
+        const newImageSrc = image.getAttribute('src').replace(oldImageQueryString, newImageQueryString);
+        // Create a promise for when the full size image is loaded.
+        imageLoadPromises.push(new Promise((resolve, reject) =&gt; {
+          image.addEventListener('load', resolve);
+          image.addEventListener('error', reject);
+          image.addEventListener('abort', resolve);
+          image.setAttribute('src', newImageSrc);
+        }));
+      }
+    });
+    await Promise.allSettled(imageLoadPromises);
+  }
+
+  pageReady.delayPageReady(disableServerSideImageResize(), 'Disable server-side image resize.');
+
   // Adjust the exported content before performing the print layout.
   pageReady.afterPageReady(() =&gt; {
     refactorAnchors();
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Translations.ko.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Translations.ko.xml
index 9cdf8b94f0cd..f403d803ecbe 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Translations.ko.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/src/main/resources/XWiki/PDFExport/Translations.ko.xml
@@ -110,4 +110,4 @@ XWiki.PDFExport.ConfigurationClass_maxContentSize.hint=단일 PDF 내보내기 
 XWiki.PDFExport.ConfigurationClass_replaceFOP=FOP 교체
 XWiki.PDFExport.ConfigurationClass_replaceFOP.hint=Apache Formatting Objects Processor(FOP)를 기반으로 이전 PDF 내보내기를 대체합니다.
 </content>
-  </xwikidoc>
+</xwikidoc>

From 432512d5fd373548f65040461f417d7d5e131e71 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Mon, 12 Feb 2024 11:05:04 +0200
Subject: [PATCH 140/143] XWIKI-21763: Disable the server-side image resizing
 while exporting to PDF * Fix test setup

---
 .../src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java      | 5 ++++-
 .../test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
index 24569481e85e..bf184f6c3f34 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/AllIT.java
@@ -37,7 +37,10 @@
         // Code macro highlighting works only if Jython is a core extension. It's not enough to use language=none in our
         // test because we want to reproduce a bug in Paged.js where white-space between highlighted tokens is lost.
         // TODO: Remove when https://jira.xwiki.org/browse/XWIKI-17972 is fixed
-        "org.python:jython-slim"
+        "org.python:jython-slim",
+        // The image plugin that performs the server-side image resize is not registered until the server is restarted
+        // so we need to make it a core extension.
+        "org.xwiki.platform:xwiki-platform-image-processing-plugin"
     },
     resolveExtraJARs = true,
     // We need the Office server because we want to be able to test how the Office macro is exported to PDF.
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
index 180b95ef2b33..e87f203f3d61 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/src/test/it/org/xwiki/export/pdf/test/ui/PDFExportIT.java
@@ -72,7 +72,10 @@
         // Code macro highlighting works only if Jython is a core extension. It's not enough to use language=none in our
         // test because we want to reproduce a bug in Paged.js where white-space between highlighted tokens is lost.
         // TODO: Remove when https://jira.xwiki.org/browse/XWIKI-17972 is fixed
-        "org.python:jython-slim"
+        "org.python:jython-slim",
+        // The image plugin that performs the server-side image resize is not registered until the server is restarted
+        // so we need to make it a core extension.
+        "org.xwiki.platform:xwiki-platform-image-processing-plugin"
     },
     resolveExtraJARs = true,
     // We need the Office server because we want to be able to test how the Office macro is exported to PDF.

From ea115b384420151befb7ef0500b328998ada0992 Mon Sep 17 00:00:00 2001
From: Lucas C <lucas.charpentier@imt-atlantique.net>
Date: Thu, 8 Feb 2024 12:15:17 +0100
Subject: [PATCH 141/143] XWIKI-21869: Upgrade to jstree 3.3.16

---
 .../xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
index c95374ee108c..b391d65bf15f 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
@@ -34,7 +34,7 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>Tree Widget</xwiki.extension.name>
-    <jstree.version>3.3.15</jstree.version>
+    <jstree.version>3.3.16</jstree.version>
   </properties>
   <dependencies>
     <dependency>

From 6a7beb3a89dec3fc54fdc568c50299103fa16e00 Mon Sep 17 00:00:00 2001
From: Lucas C <lucas.charpentier@imt-atlantique.net>
Date: Thu, 8 Feb 2024 13:41:58 +0100
Subject: [PATCH 142/143] XWIKI-21851: Found page in the Page Tree macro with a
 Solr field cannot be opened by left-clicking * Updated the default option to
 allow reactivation of a link that's already selected.

---
 .../xwiki-platform-tree-webjar/src/main/webjar/finder.js       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.js b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.js
index 8b2f7ba1a26e..70699b33bbd2 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.js
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.js
@@ -34,6 +34,9 @@ define(['jquery', 'jsTree', 'xwiki-events-bridge'], function($) {
     }
   };
 
+  // We want to still activate the links with a click even after they are selected from the finder.
+  $.jstree.defaults.core.allow_reselect = true;
+
   var createSuggestInput = function(options) {
     var input = document.createElement('input');
     input.type = 'text';

From 1c596eadf72bde73ebdabe9b834be4a7c52d38a1 Mon Sep 17 00:00:00 2001
From: Lucas C <lucas.charpentier@imt-atlantique.net>
Date: Mon, 12 Feb 2024 14:56:14 +0100
Subject: [PATCH 143/143] XWIKI-21772: Admin section: make user directory pass
 webstandard tests (#2795)

* Fixed the input label validation to allow another standard HTML way to link the label to its in
---
 .../xwiki-platform-distribution-flavor-test/pom.xml         | 3 +--
 .../xwiki/validator/HTML5DutchWebGuidelinesValidator.java   | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index 57e5f8c1fd2e..e9c4d8602b16 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -249,8 +249,7 @@
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Rights
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=usersgroups.extensionrights
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=UserProfile
-                <!--/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=userdirectory
-                  TODO https://jira.xwiki.org/browse/XWIKI-21772 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=userdirectory
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Registration
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Invitation
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Authentication
diff --git a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
index 71d1719e92aa..cd8dd938c709 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
+++ b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
@@ -1160,12 +1160,16 @@ public void validateRpd13s1()
                 if (id != null) {
                     // Looking for the label associated to the input.
                     boolean hasLabel = false;
-                    for (Element label : getElement(ELEM_BODY).getElementsByTag("label")) {
+                    String labelTagName = "label";
+                    for (Element label : getElement(ELEM_BODY).getElementsByTag(labelTagName)) {
                         if (id.equals(label.attr("for"))) {
                             hasLabel = true;
                             break;
                         }
                     }
+                    // From MDN webdocs: Alternatively, you can nest the <input> directly inside the <label>,
+                    // in which case the for and id attributes are not needed because the association is implicit
+                    hasLabel = hasLabel || input.parent().tag().getName().equals(labelTagName);
                     assertTrue(Type.ERROR, message, hasLabel);
                 }
             }