Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-18311

Many 'Collision found on object property' errors leading to merge conflicts when upgrading to XWiki 12.10.3

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Blocker
    • 12.10.4
    • 12.10.3
    • Distribution - Flavor
    • Windows 10 Pro 64 bit, Chrome 88, Edge 88 and IE11 on MySQL 8, MariaDB 10.5 and PostgreSQL 13, Tomcat 9.0.41
    • Unknown
    • N/A
    • N/A

    Description

      STEPS TO REPRODUCE

      1. Login to an older instance (e.g. 8.4.6 or 11.10.13)
      2. Create a new subwiki
      3. Close the instance
      4. Go to the newer instance (12.10.3) and copy/cut the
        [...]webapps\xwiki

        folder and replace it (first delete the old one) in the same location on the older version

      5. Start XWiki and follow the Distribution Wizard through the upgrade process
      6. Go to Wiki Index and click on the previously created subwiki's name to start and run the DW for it

      EXPECTED RESULTS

      The upgrade process is completed successfully without errors both on the Main wiki, as well as on subwiki.

      ACTUAL RESULTS

      On Step 2 - Flavor, there are many errors encountered like:

      Collision found on object property [...]

      which lead to merge conflicts on the following pages:

      • When upgrading from XWiki 8.4.6 to 12.10.3 (in no particular order):
        - XWiki.AttachmentSelector
        - Help.SupportPanel.WebHome
        - Help.TipsPanel.WebHome
        - Panels.Applications
        - Panels.DocumentInformation
        - Panels.MyRecentModifications
        - Panels.Navigation
        - XWiki.RegistrationConfig
        - XWiki.MessageStreamConfig
        - XWiki.UserDirectoryConfiguration
        - XWiki.UserProfileUIX
        
        - WikiManager.WikiUsers (only on subwiki)
      • When upgrading from XWiki 11.10.13 to 12.10.3 (in no particular order):
        - Panels.DocumentInformation
        - XWiki.MessageStreamConfig
        - XWiki.Notifications.Code.NotificationsApplicationsPreferencesMacro

        When migrating from XWiki 8.4.6 to 12.10.3 (by resolving all merge conflicts automatically), the Dashboard entry is displayed twice in Applications Panel.

      The issues could not be reproduced when upgrading to XWiki 12.10.2.

      Attachments

        1. Collision_Attachment_Selector_1.png
          98 kB
          Ilie Andriuta
        2. Collision_Attachment_Selector_Subwiki.png
          89 kB
          Ilie Andriuta
        3. Collision_Help_SupportPanel.png
          78 kB
          Ilie Andriuta
        4. Collision_Help_TipsPanel.png
          79 kB
          Ilie Andriuta
        5. Collision_NotificationsApplicationsPreferencesMacro_from_11_10_13.png
          129 kB
          Ilie Andriuta
        6. Collision_Panels_Applications.png
          80 kB
          Ilie Andriuta
        7. Collision_Panels_DocumentInformation.png
          87 kB
          Ilie Andriuta
        8. Collision_Panels_MyRecentModifications.png
          84 kB
          Ilie Andriuta
        9. Collision_Panels_Navigation.png
          78 kB
          Ilie Andriuta
        10. Collision_RegistrationConfig.png
          80 kB
          Ilie Andriuta
        11. Collision_WikiManager_WikiUsers_Subwiki.png
          94 kB
          Ilie Andriuta
        12. Collision_XWiki_MessageStreamConfig.png
          83 kB
          Ilie Andriuta
        13. Collision_XWiki_UserDirectoryConfiguration.png
          86 kB
          Ilie Andriuta
        14. Collision_XWiki_UserProfileUIX.png
          79 kB
          Ilie Andriuta
        15. Dashboard_Twice.png
          66 kB
          Ilie Andriuta

        Issue Links

          Activity

            People

              tmortagne Thomas Mortagne
              iandriuta Ilie Andriuta
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: