Upgrade parent to 14.10 xwikisas#108

* Edited parent version * Import/export result
KebabRonin · Nov 13, 2024 · b1f1495 · b1f1495
1 parent 9fc08b9
commit b1f1495
Show file tree

Hide file tree

Showing 26 changed files with 71 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This is an application for handling meetings.
 * [Documentation](https://store.xwiki.com/xwiki/bin/view/Extension/MeetingApplication)
 * Communication: [Mailing List](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists>), [Chat]( http://dev.xwiki.org/xwiki/bin/view/Community/Chat)
 * [Development Practices](http://dev.xwiki.org)
-* Minimal XWiki version supported: XWiki 13.10
+* Minimal XWiki version supported: XWiki 14.10
 * License: LGPL 2.1+
 * Translations: N/A
 * Sonar Dashboard: N/A

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>com.xwiki.parent</groupId>
     <artifactId>xwikisas-parent-platform</artifactId>
-    <version>13.10-3</version>
+    <version>14.10-1</version>
   </parent>
   <groupId>com.xwiki.meeting</groupId>
   <artifactId>application-meeting</artifactId>

diff --git a/ui/src/main/resources/Meeting/CalendarView.xml b/ui/src/main/resources/Meeting/CalendarView.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.CalendarView" locale="">
+<xwikidoc version="1.5" reference="Meeting.CalendarView" locale="">
   <web>Meeting</web>
   <name>CalendarView</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Configuration.xml b/ui/src/main/resources/Meeting/Code/Configuration.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Configuration" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Configuration" locale="">
   <web>Meeting.Code</web>
   <name>Configuration</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/ConfigurationClass.xml b/ui/src/main/resources/Meeting/Code/ConfigurationClass.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.ConfigurationClass" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.ConfigurationClass" locale="">
   <web>Meeting.Code</web>
   <name>ConfigurationClass</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/DeactivateMapService.xml b/ui/src/main/resources/Meeting/Code/DeactivateMapService.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.DeactivateMapService" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.DeactivateMapService" locale="">
   <web>Meeting.Code</web>
   <name>DeactivateMapService</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Macros.xml b/ui/src/main/resources/Meeting/Code/Macros.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Macros" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Macros" locale="">
   <web>Meeting.Code</web>
   <name>Macros</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/MeetingClass.xml b/ui/src/main/resources/Meeting/Code/MeetingClass.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.MeetingClass" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.MeetingClass" locale="">
   <web>Meeting.Code</web>
   <name>MeetingClass</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/MeetingSheet.xml b/ui/src/main/resources/Meeting/Code/MeetingSheet.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.MeetingSheet" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.MeetingSheet" locale="">
   <web>Meeting.Code</web>
   <name>MeetingSheet</name>
   <language/>
@@ -303,6 +303,7 @@
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -453,6 +454,7 @@ if(displayMap) {
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>
@@ -585,6 +587,7 @@ if(displayMap) {
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>

diff --git a/ui/src/main/resources/Meeting/Code/MeetingTemplate.xml b/ui/src/main/resources/Meeting/Code/MeetingTemplate.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.MeetingTemplate" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.MeetingTemplate" locale="">
   <web>Meeting.Code</web>
   <name>MeetingTemplate</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/MeetingTemplateProvider.xml b/ui/src/main/resources/Meeting/Code/MeetingTemplateProvider.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.MeetingTemplateProvider" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.MeetingTemplateProvider" locale="">
   <web>Meeting.Code</web>
   <name>MeetingTemplateProvider</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Migrations/1.11.xml b/ui/src/main/resources/Meeting/Code/Migrations/1.11.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Migrations.1\.11" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Migrations.1\.11" locale="">
   <web>Meeting.Code.Migrations</web>
   <name>1.11</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Migrations/1.9.1.xml b/ui/src/main/resources/Meeting/Code/Migrations/1.9.1.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Migrations.1\.9\.1" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Migrations.1\.9\.1" locale="">
   <web>Meeting.Code.Migrations</web>
   <name>1.9.1</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Migrations/1.9.5.xml b/ui/src/main/resources/Meeting/Code/Migrations/1.9.5.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Migrations.1\.9\.5" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Migrations.1\.9\.5" locale="">
   <web>Meeting.Code.Migrations</web>
   <name>1.9.5</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/Migrations/MigrationMacros.xml b/ui/src/main/resources/Meeting/Code/Migrations/MigrationMacros.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Migrations.MigrationMacros" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Migrations.MigrationMacros" locale="">
   <web>Meeting.Code.Migrations</web>
   <name>MigrationMacros</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/NextMeetingsMacro.xml b/ui/src/main/resources/Meeting/Code/NextMeetingsMacro.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.NextMeetingsMacro" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.NextMeetingsMacro" locale="">
   <web>Meeting.Code</web>
   <name>NextMeetingsMacro</name>
   <language/>
@@ -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>
@@ -214,7 +215,7 @@
         <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.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <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.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -234,6 +235,7 @@
         <name>code</name>
         <number>10</number>
         <prettyName>Macro code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -246,6 +248,7 @@
         <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>
@@ -289,22 +292,32 @@
         <values>Optional|Mandatory|No content</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </contentType>
-      <defaultCategory>
+      <defaultCategories>
+        <cache>0</cache>
         <disabled>0</disabled>
-        <name>defaultCategory</name>
+        <displayType>input</displayType>
+        <freeText>forbidden</freeText>
+        <largeStorage>0</largeStorage>
+        <multiSelect>1</multiSelect>
+        <name>defaultCategories</name>
         <number>4</number>
-        <prettyName>Default category</prettyName>
-        <size>30</size>
+        <prettyName>Default categories</prettyName>
+        <relationalStorage>0</relationalStorage>
+        <separator> </separator>
+        <separators>|, </separators>
+        <size>1</size>
         <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </defaultCategory>
+        <values/>
+        <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+      </defaultCategories>
       <description>
         <contenttype>PureText</contenttype>
         <disabled>0</disabled>
         <editor>PureText</editor>
         <name>description</name>
         <number>3</number>
         <prettyName>Macro description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -431,6 +444,9 @@
     <property>
       <contentType>No content</contentType>
     </property>
+    <property>
+      <defaultCategories/>
+    </property>
     <property>
       <defaultCategory/>
     </property>
@@ -481,6 +497,7 @@
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -559,6 +576,7 @@
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -637,6 +655,7 @@
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>
@@ -715,6 +734,7 @@
         <name>description</name>
         <number>2</number>
         <prettyName>Parameter description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>

diff --git a/ui/src/main/resources/Meeting/Code/NextMeetingsPanel.xml b/ui/src/main/resources/Meeting/Code/NextMeetingsPanel.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.NextMeetingsPanel" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.NextMeetingsPanel" locale="">
   <web>Meeting.Code</web>
   <name>NextMeetingsPanel</name>
   <language/>
@@ -77,7 +77,7 @@
         <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.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
+        <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.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values>
         <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
       </async_context>
       <async_enabled>
@@ -115,6 +115,7 @@
         <name>content</name>
         <number>5</number>
         <prettyName>Executed Content</prettyName>
+        <restricted>0</restricted>
         <rows>25</rows>
         <size>120</size>
         <unmodifiable>0</unmodifiable>
@@ -126,6 +127,7 @@
         <name>description</name>
         <number>2</number>
         <prettyName>Description</prettyName>
+        <restricted>0</restricted>
         <rows>5</rows>
         <size>40</size>
         <unmodifiable>0</unmodifiable>

diff --git a/ui/src/main/resources/Meeting/Code/SendInvitationEmail.xml b/ui/src/main/resources/Meeting/Code/SendInvitationEmail.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.SendInvitationEmail" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.SendInvitationEmail" locale="">
   <web>Meeting.Code</web>
   <name>SendInvitationEmail</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/SkinExtension.xml b/ui/src/main/resources/Meeting/Code/SkinExtension.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.SkinExtension" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.SkinExtension" locale="">
   <web>Meeting.Code</web>
   <name>SkinExtension</name>
   <language/>
@@ -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>

diff --git a/ui/src/main/resources/Meeting/Code/Translations.fr.xml b/ui/src/main/resources/Meeting/Code/Translations.fr.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Translations" locale="fr">
+<xwikidoc version="1.5" reference="Meeting.Code.Translations" locale="fr">
   <web>Meeting.Code</web>
   <name>Translations</name>
   <language>fr</language>

diff --git a/ui/src/main/resources/Meeting/Code/Translations.sk.xml b/ui/src/main/resources/Meeting/Code/Translations.sk.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Translations" locale="sk">
+<xwikidoc version="1.5" reference="Meeting.Code.Translations" locale="sk">
   <web>Meeting.Code</web>
   <name>Translations</name>
   <language>sk</language>

diff --git a/ui/src/main/resources/Meeting/Code/Translations.xml b/ui/src/main/resources/Meeting/Code/Translations.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.Translations" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.Translations" locale="">
   <web>Meeting.Code</web>
   <name>Translations</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/WebHome.xml b/ui/src/main/resources/Meeting/Code/WebHome.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.WebHome" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.WebHome" locale="">
   <web>Meeting.Code</web>
   <name>WebHome</name>
   <language/>

diff --git a/ui/src/main/resources/Meeting/Code/WebHomeSheet.xml b/ui/src/main/resources/Meeting/Code/WebHomeSheet.xml
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<xwikidoc version="1.4" reference="Meeting.Code.WebHomeSheet" locale="">
+<xwikidoc version="1.5" reference="Meeting.Code.WebHomeSheet" locale="">
   <web>Meeting.Code</web>
   <name>WebHomeSheet</name>
   <language/>
@@ -163,6 +163,7 @@
         <name>code</name>
         <number>2</number>
         <prettyName>Code</prettyName>
+        <restricted>0</restricted>
         <rows>20</rows>
         <size>50</size>
         <unmodifiable>0</unmodifiable>