[midPoint-git] [Evolveum/midpoint] f01ab0: revert source and target files for testing of merging

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f01ab0cf25a0e9772b84281868c0e4937831325c
      https://github.com/Evolveum/midpoint/commit/f01ab0cf25a0e9772b84281868c0e4937831325c
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-result.xml
    M infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-source.xml
    M infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-target.xml
    M infra/schema/src/test/resources/merger/dashboard/dashboard-admin-result.xml
    M infra/schema/src/test/resources/merger/dashboard/dashboard-admin-source.xml
    M infra/schema/src/test/resources/merger/dashboard/dashboard-admin-target.xml
    M infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-result.xml
    M infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-source.xml
    M infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-target.xml
    M infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-result.xml
    M infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-source.xml
    M infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-target.xml
    M infra/schema/src/test/resources/merger/report/report-certification-campaigns-result.xml
    M infra/schema/src/test/resources/merger/report/report-certification-campaigns-source.xml
    M infra/schema/src/test/resources/merger/report/report-certification-campaigns-target.xml
    M infra/schema/src/test/resources/merger/role/role-enduser-result.xml
    M infra/schema/src/test/resources/merger/role/role-enduser-source.xml
    M infra/schema/src/test/resources/merger/role/role-enduser-target.xml
    M infra/schema/src/test/resources/merger/role/role-superuser-source.xml
    M infra/schema/src/test/resources/merger/role/role-superuser-target.xml
    M infra/schema/src/test/resources/merger/system-configuration/system-configuration-result.xml
    M infra/schema/src/test/resources/merger/system-configuration/system-configuration-source.xml
    M infra/schema/src/test/resources/merger/system-configuration/system-configuration-target.xml
    M infra/schema/src/test/resources/merger/task/task-validity-result.xml
    M infra/schema/src/test/resources/merger/task/task-validity-source.xml
    M infra/schema/src/test/resources/merger/task/task-validity-target.xml
    M infra/schema/src/test/resources/merger/user/user-administrator-result.xml
    M infra/schema/src/test/resources/merger/user/user-administrator-source.xml
    M infra/schema/src/test/resources/merger/user/user-administrator-target.xml

  Log Message:
  -----------
  revert source and target files for testing of merging


  Commit: 7faf2dc4e5a3922c91a003cca2f2300f4ee1d79c
      https://github.com/Evolveum/midpoint/commit/7faf2dc4e5a3922c91a003cca2f2300f4ee1d79c
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/InitialObjectsAction.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/d2e034c1ecae...7faf2dc4e5a3