[midPoint-git] [Evolveum/midpoint] 348792: Fix read-update-read provisioning mode

[Dominik Horvath]

  Branch: refs/heads/contentAssist
  Home:   https://github.com/Evolveum/midpoint
  Commit: 348792417b2db7081bc5fd5717d055fc2c2f2da8
      https://github.com/Evolveum/midpoint/commit/348792417b2db7081bc5fd5717d055fc2c2f2da8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-12-09 (Mon, 09 Dec 2024)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectModifyOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectUcfModifyOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowModifyOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyVolatility.java

  Log Message:
  -----------
  Fix read-update-read provisioning mode

The code for merging discovered changes with the originally requested
ones is now fixed: we merge them, instead of simply concatenating them.

This fixes failing volatility tests on generic repo.


  Commit: 7a73c312711a5411e34ed81bbdb8b77deff2b1bb
      https://github.com/Evolveum/midpoint/commit/7a73c312711a5411e34ed81bbdb8b77deff2b1bb
  Author: Patrik <patkomalinak at gmail.com>
  Date:   2024-12-09 (Mon, 09 Dec 2024)

  Changed paths:
    M gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
    M gui/admin-gui/src/frontend/scss/midpoint-utils.scss
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/Badge.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignActionButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignTilePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignTilePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/helpers/CampaignStateHelper.java

  Log Message:
  -----------
  Certifications: Upgrading styles for buttons and campaign cards


  Commit: e983467fb918af279f72d44917b8c4af3558ab99
      https://github.com/Evolveum/midpoint/commit/e983467fb918af279f72d44917b8c4af3558ab99
  Author: dominikhorvath <dominikhorvath138 at gmail.com>
  Date:   2024-12-09 (Mon, 09 Dec 2024)

  Changed paths:
    M gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
    M gui/admin-gui/src/frontend/scss/midpoint-utils.scss
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/Badge.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignActionButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignTilePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignTilePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/component/CampaignsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/certification/helpers/CampaignStateHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectModifyOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectUcfModifyOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowModifyOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyVolatility.java

  Log Message:
  -----------
  Merge branch 'master' into contentAssist


  Commit: 8f70078702206b7b8d8599033eb90c200cd21299
      https://github.com/Evolveum/midpoint/commit/8f70078702206b7b8d8599033eb90c200cd21299
  Author: dominikhorvath <dominikhorvath138 at gmail.com>
  Date:   2024-12-09 (Mon, 09 Dec 2024)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/QueryPlaygroundPanelAjaxListener.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/contentAssist' into contentAssist


Compare: https://github.com/Evolveum/midpoint/compare/7d6a6ec907c6...8f7007870220

To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications