[midPoint-git] [Evolveum/midpoint] 28639e: auth caching, not finished, not tested

[Viliam Repan]

  Branch: refs/heads/feature/performance
  Home:   https://github.com/Evolveum/midpoint
  Commit: 28639e11452be8e6d4e1e4d795eb0696fd2272c9
      https://github.com/Evolveum/midpoint/commit/28639e11452be8e6d4e1e4d795eb0696fd2272c9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  auth caching, not finished, not tested


  Commit: 15dd458eb9696f744dfa36bf179a2aa2b564d86a
      https://github.com/Evolveum/midpoint/commit/15dd458eb9696f744dfa36bf179a2aa2b564d86a
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java

  Log Message:
  -----------
  induced entitlements panel, columns are fixed


  Commit: dccede194e47178230de735c553c74b202ce93e5
      https://github.com/Evolveum/midpoint/commit/dccede194e47178230de735c553c74b202ce93e5
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
    A model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 20117d0675b5d0f944ad58d2be168ecf13a855f4
      https://github.com/Evolveum/midpoint/commit/20117d0675b5d0f944ad58d2be168ecf13a855f4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml

  Log Message:
  -----------
  Add searchOptions extension property (MID-3293)

This property can be used e.g. to specify 'distinct' option to be
used when searching for objects in iterative tasks.

Added samples how to use distinct in iterative tasks and bulk actions.
See also https://wiki.evolveum.com/display/midPoint/Redundant+objects+processing+elimination+HOWTO.


  Commit: cefb11f11bac7cd5c3449b4ef34d7e54fd641a0c
      https://github.com/Evolveum/midpoint/commit/cefb11f11bac7cd5c3449b4ef34d7e54fd641a0c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Upgrade CXF from 3.2.1 to 3.2.4 (MID-4353)


  Commit: 557f26665a89ceb7b067461ede7d0027b11351c9
      https://github.com/Evolveum/midpoint/commit/557f26665a89ceb7b067461ede7d0027b11351c9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java

  Log Message:
  -----------
  Fix hashed password notifications (MID-4566)

This is only a PRELIMINARY fix. It expects that the password
stored in the primary delta is not hashed even after model execution.
To be discussed further.


  Commit: 2d108bbd86e08ead296eb7ff8786905bcb0a6436
      https://github.com/Evolveum/midpoint/commit/2d108bbd86e08ead296eb7ff8786905bcb0a6436
  Author: Viliam Repan <1azyman at users.noreply.github.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Updated maven deploy version plugin


  Commit: 9a5a418640de1aac5a6307220eaeeaec7e7391d4
      https://github.com/Evolveum/midpoint/commit/9a5a418640de1aac5a6307220eaeeaec7e7391d4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M pom.xml

  Log Message:
  -----------
  proper version update for maven deploy plugin


  Commit: 95bbcb0643bc483af43582c211f616e8f669c8c2
      https://github.com/Evolveum/midpoint/commit/95bbcb0643bc483af43582c211f616e8f669c8c2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M samples/model-client-sample/pom.xml

  Log Message:
  -----------
  proper version update for maven deploy plugin


  Commit: 8c1c3155d2f2ace1378d5cba9c41d11cff968145
      https://github.com/Evolveum/midpoint/commit/8c1c3155d2f2ace1378d5cba9c41d11cff968145
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/performance-stable


  Commit: 2bdb2a6a0ff14579a497ab56c78af913b00d8907
      https://github.com/Evolveum/midpoint/commit/2bdb2a6a0ff14579a497ab56c78af913b00d8907
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java

  Log Message:
  -----------
  induced entitlements filter fixes


  Commit: 9d88adbc5f6e236aa82c62d9b91ea7f97cfaa4c4
      https://github.com/Evolveum/midpoint/commit/9d88adbc5f6e236aa82c62d9b91ea7f97cfaa4c4
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 0b8e00203bf5644f0e033b6b4a49d4bd1f602f32
      https://github.com/Evolveum/midpoint/commit/0b8e00203bf5644f0e033b6b4a49d4bd1f602f32
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml

  Log Message:
  -----------
  Adapt TestPasswordDefaultHashing to MID-4553

The history storage is now hashed as well.

(cherry picked from commit 2df4a0a)


  Commit: adecade10753409e481f418b9cc79e695a5048a4
      https://github.com/Evolveum/midpoint/commit/adecade10753409e481f418b9cc79e695a5048a4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java

  Log Message:
  -----------
  Add tests for user password notifier (MID-4566)

Also: Fixed the user password notifier to work with secondary deltas
as well (test316UserRecompute). Fixed the notifier to stop expecting
full success.

This solution is still not complete - we have to find out somehow
if the focus update operation(s) were carried out or not. Otherwise
we could report password change even if it was not in fact executed.

(cherry picked from commit b2ef649)


  Commit: 60baaf7b3cc4073d316dbd8f1cb2187855fb781a
      https://github.com/Evolveum/midpoint/commit/60baaf7b3cc4073d316dbd8f1cb2187855fb781a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java

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


  Commit: caa1af080494eb4f13625ae304f5cd21ef150b5c
      https://github.com/Evolveum/midpoint/commit/caa1af080494eb4f13625ae304f5cd21ef150b5c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M pom.xml
    M samples/model-client-sample/pom.xml

  Log Message:
  -----------
  version update for maven deploy plugin


  Commit: 421bcaa3a198dead9c163a2d4d5f00d8f0ed1de9
      https://github.com/Evolveum/midpoint/commit/421bcaa3a198dead9c163a2d4d5f00d8f0ed1de9
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  MID-4543 Assign construction: kind+intent fields not readonly


  Commit: aeaa15afd211329a0ad6ba1be9e38e230f74df9e
      https://github.com/Evolveum/midpoint/commit/aeaa15afd211329a0ad6ba1be9e38e230f74df9e
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M pom.xml
    M samples/model-client-sample/pom.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: e2d24afe3689ae095f6807e5207a4bb899a539fc
      https://github.com/Evolveum/midpoint/commit/e2d24afe3689ae095f6807e5207a4bb899a539fc
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java

  Log Message:
  -----------
  fixing MID-4563 and MID-4562


  Commit: 839fde5bc90571ff5ae68e01b31bb715ea2ea1e8
      https://github.com/Evolveum/midpoint/commit/839fde5bc90571ff5ae68e01b31bb715ea2ea1e8
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
    A model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M samples/model-client-sample/pom.xml
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: f7387a0c771de374ea4f265d42f74729b4066a61
      https://github.com/Evolveum/midpoint/commit/f7387a0c771de374ea4f265d42f74729b4066a61
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4521 Policy breach message is not localized in self-service


  Commit: 8be4b5c1ea56a1f31a7672c03e1f9f350dede923
      https://github.com/Evolveum/midpoint/commit/8be4b5c1ea56a1f31a7672c03e1f9f350dede923
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 6ebfbcbd02b6c0f7602085b053c12c1ee4a3f7df
      https://github.com/Evolveum/midpoint/commit/6ebfbcbd02b6c0f7602085b053c12c1ee4a3f7df
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  adding  misssing localization key


  Commit: 360187c44a05db79ac0f9bbcd824505c1363afcb
      https://github.com/Evolveum/midpoint/commit/360187c44a05db79ac0f9bbcd824505c1363afcb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 140438f1ac54bad8e8b74b40ba9001698f2e9beb
      https://github.com/Evolveum/midpoint/commit/140438f1ac54bad8e8b74b40ba9001698f2e9beb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java

  Log Message:
  -----------
  fixing typo


  Commit: 7d7a974afaa23cfc24426a006d180403f6e275a7
      https://github.com/Evolveum/midpoint/commit/7d7a974afaa23cfc24426a006d180403f6e275a7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fix showing names in 'add' approvals (MID-4512)

When approving object creation, the object has an OID but does not
exist in repository. This caused problems in task details and task
lists pages.

Repository change: now we are storing targetName for references
in the XML form of stored objects (if set by caller).


  Commit: 11c4f774f10159bf65cc2f63d7cfd5d4ab31a64b
      https://github.com/Evolveum/midpoint/commit/11c4f774f10159bf65cc2f63d7cfd5d4ab31a64b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java

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


  Commit: 2377d628bacabaa7dea9a86280b022f2e4acbf5f
      https://github.com/Evolveum/midpoint/commit/2377d628bacabaa7dea9a86280b022f2e4acbf5f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategyFactory.java

  Log Message:
  -----------
  Add forgotten exception cause


  Commit: ef4b4cedb0b7233e26cb609c5ec0d709415befd7
      https://github.com/Evolveum/midpoint/commit/ef4b4cedb0b7233e26cb609c5ec0d709415befd7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategyFactory.java

  Log Message:
  -----------
  Add forgotten exception cause

(cherry picked from commit 2377d62)


  Commit: 33102dcaac169ade322c50127a44b9ba2099656b
      https://github.com/Evolveum/midpoint/commit/33102dcaac169ade322c50127a44b9ba2099656b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java

  Log Message:
  -----------
  Fix channel for recompute notifications (MID-3476)

AbstractSearchIterativeTaskHandler has now a support for setting
task channel if none is present.


  Commit: f086922a23171c114ccf28bec08d51b9cfc6e9d5
      https://github.com/Evolveum/midpoint/commit/f086922a23171c114ccf28bec08d51b9cfc6e9d5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestPartitioning.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkBucketStrategies.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkersManagement.java

  Log Message:
  -----------
  Relieve work bucket allocation contention

New configuration parameters related to work bucket allocation
contention management were added: workAllocationMaxAttempts,
workAllocationRetryInterval, workAllocationInitialDelay,
workAllocationDefaultFreeBucketWaitInterval.

They are part of <taskManager> configuration section.


  Commit: b0917739cb1dd6dbed0cd8afec93be93db64cd21
      https://github.com/Evolveum/midpoint/commit/b0917739cb1dd6dbed0cd8afec93be93db64cd21
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java

  Log Message:
  -----------
  class loading configuration for custom drivers fix for ninja


  Commit: 75ee434b2020df0f10b42f59301a5bbfb290163c
      https://github.com/Evolveum/midpoint/commit/75ee434b2020df0f10b42f59301a5bbfb290163c
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java

  Log Message:
  -----------
  MID-4494 Localization warnings after login (self service dashboard)


  Commit: 61fb70a7000518af469f053d5ba913c780f8a730
      https://github.com/Evolveum/midpoint/commit/61fb70a7000518af469f053d5ba913c780f8a730
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategyFactory.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestPartitioning.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkBucketStrategies.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkersManagement.java
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 94bb35445a8e388addbc224fa7e67ed04a73a5ba
      https://github.com/Evolveum/midpoint/commit/94bb35445a8e388addbc224fa7e67ed04a73a5ba
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  optimize map iterations using entry-sets.


  Commit: 6772472dd5a9bcbabd275c33d610371458e46dca
      https://github.com/Evolveum/midpoint/commit/6772472dd5a9bcbabd275c33d610371458e46dca
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java

  Log Message:
  -----------
  Use URI instead of URL to avoid domain name resolution for maps


  Commit: a4430de61f8c592c3f9253e5594919ad58e96eb7
      https://github.com/Evolveum/midpoint/commit/a4430de61f8c592c3f9253e5594919ad58e96eb7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  improved auth caching, now repo cache layer responsible for caching


  Commit: 625559fbdf4c93f63ede16ce7d0ea6953a87f95c
      https://github.com/Evolveum/midpoint/commit/625559fbdf4c93f63ede16ce7d0ea6953a87f95c
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java

  Log Message:
  -----------
  use static inner classes to keep instance size small, and avoid keeping references to
creator objects if appropriate.


  Commit: f3c2d1f569f832ac644723344f589811812b6471
      https://github.com/Evolveum/midpoint/commit/f3c2d1f569f832ac644723344f589811812b6471
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java

  Log Message:
  -----------
  Fix channel for live sync notifications (MID-4081)


  Commit: e1df2607f341c161446a62c6f627c81c9b39c92e
      https://github.com/Evolveum/midpoint/commit/e1df2607f341c161446a62c6f627c81c9b39c92e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M repo/repo-cache/pom.xml
    R repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheKey.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheObject.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  improved repository cache layer


  Commit: 2b4660cb5aeb8d6385762525faf75f2301cd790b
      https://github.com/Evolveum/midpoint/commit/2b4660cb5aeb8d6385762525faf75f2301cd790b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge pull request #75 from Evolveum/map-iteration

Optimize map iterations using entrySet()


  Commit: 594e8e243a8ad3cb58bb45d760681b157628d5e6
      https://github.com/Evolveum/midpoint/commit/594e8e243a8ad3cb58bb45d760681b157628d5e6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java

  Log Message:
  -----------
  Merge pull request #76 from Evolveum/url-to-uri

Use URI instead of URL to avoid domain name resolution for maps


  Commit: 2ce6acd869ab809dcea0b45fa40fa75e756e8d5b
      https://github.com/Evolveum/midpoint/commit/2ce6acd869ab809dcea0b45fa40fa75e756e8d5b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java

  Log Message:
  -----------
  Merge pull request #77 from Evolveum/static-inner-class

Use static inner classes to keep class instance size small


  Commit: 8ee586fb0f80b27c615b3880a76117a7b560af4d
      https://github.com/Evolveum/midpoint/commit/8ee586fb0f80b27c615b3880a76117a7b560af4d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java

  Log Message:
  -----------
  small improvement for sorting in GUI


  Commit: 5679841bf9c81d0a714afe2b5bd56d9f20c3aac5
      https://github.com/Evolveum/midpoint/commit/5679841bf9c81d0a714afe2b5bd56d9f20c3aac5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: e4c7ec2383d5a6401563222043cd8c197c0d83c6
      https://github.com/Evolveum/midpoint/commit/e4c7ec2383d5a6401563222043cd8c197c0d83c6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Partially reverting commit 2b4660cb5aeb8d6385762525faf75f2301cd790b, as the obvioysly the entrySet() optimization does not work everywhere.


  Commit: 11114f3de20b7f8c6cf19e6712ff27c562c7300e
      https://github.com/Evolveum/midpoint/commit/11114f3de20b7f8c6cf19e6712ff27c562c7300e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M samples/policy/meta/policies-meta-approval.xml

  Log Message:
  -----------
  Fixing policy sample


  Commit: 39e395e97e550840a45e4bb595584b56de6348d4
      https://github.com/Evolveum/midpoint/commit/39e395e97e550840a45e4bb595584b56de6348d4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  improved repository cache layer


  Commit: a7cd9d2aa2305f2de7a7002d6264abdd2bbc58f0
      https://github.com/Evolveum/midpoint/commit/a7cd9d2aa2305f2de7a7002d6264abdd2bbc58f0
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java

  Log Message:
  -----------
  MID-3253 "Delete all identities" -> OpResult box should be blue (background), not green (immediate success)


  Commit: 0874dcf3c08f29f675bd1814161ed3d73e4bb2e6
      https://github.com/Evolveum/midpoint/commit/0874dcf3c08f29f675bd1814161ed3d73e4bb2e6
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M samples/policy/meta/policies-meta-approval.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 7b037ceb01a338326217ffc4fae46bc26059263d
      https://github.com/Evolveum/midpoint/commit/7b037ceb01a338326217ffc4fae46bc26059263d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java

  Log Message:
  -----------
  Support more notification recipients (MID-4534)

When recipient expression was used, the number of recipients
was limited to 1. Thanking Michael for the fix.

(cherry picked from commit c5757c3)


  Commit: 746dea63c0564b462c55a255ad77c0ce6f6661ec
      https://github.com/Evolveum/midpoint/commit/746dea63c0564b462c55a255ad77c0ce6f6661ec
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  MID-4144 GUI fields: Cant copy text from readonly fields


  Commit: ff9aabf98aada8179f3c696cd475798fe8c0f8a9
      https://github.com/Evolveum/midpoint/commit/ff9aabf98aada8179f3c696cd475798fe8c0f8a9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java

  Log Message:
  -----------
  fixing registration related issues - custom form used


  Commit: 9116c051530cc9b9890e1905eb69df7e733cc5a4
      https://github.com/Evolveum/midpoint/commit/9116c051530cc9b9890e1905eb69df7e733cc5a4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java

  Log Message:
  -----------
  Create all approval tasks as root ones (MID-4508)

Up to now, approvals that were started from a background task (e.g.
live sync, reconciliation or members add/delete) executed in tasks
which were subtasks of that background task. This had a number of
negative consequences e.g. that such approvals were not shown on
user's Tasks tab. Now all approval tasks are started as standalone
ones.

(cherry picked from commit e981801)


  Commit: fa01aa0580c5be9c9cac4ce8a69e9516bb29153c
      https://github.com/Evolveum/midpoint/commit/fa01aa0580c5be9c9cac4ce8a69e9516bb29153c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java

  Log Message:
  -----------
  Stop storing ref.targetName into repository

It seems that storing targetName on references is not a good idea
e.g. because of GUI complications and of general principle of avoiding
data redundancy.

(cherry picked from commit 0e2f9d4)


  Commit: 5624dc987fdd31f18134156c270212f74215ab19
      https://github.com/Evolveum/midpoint/commit/5624dc987fdd31f18134156c270212f74215ab19
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java

  Log Message:
  -----------
  Re-fix showing names in 'add' approvals (MID-4512)

Now the information goes from wfContext.objectRef that contains
the whole object.

(cherry picked from commit 640c8c7)


  Commit: 56c2aa6efb1506cc0a2871a46fa492376a11f620
      https://github.com/Evolveum/midpoint/commit/56c2aa6efb1506cc0a2871a46fa492376a11f620
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M samples/policy/meta/policies-meta-approval.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

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


  Commit: ad70ec548b67962c137bcd655d1bd9df1de0cf14
      https://github.com/Evolveum/midpoint/commit/ad70ec548b67962c137bcd655d1bd9df1de0cf14
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  some style fix


  Commit: 35533daf5de90a6702c59eba42143cfa44ec327e
      https://github.com/Evolveum/midpoint/commit/35533daf5de90a6702c59eba42143cfa44ec327e
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 2c6254c23fc9cad4c0e17cb81f87fd35cc7dc1be
      https://github.com/Evolveum/midpoint/commit/2c6254c23fc9cad4c0e17cb81f87fd35cc7dc1be
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java

  Log Message:
  -----------
  Fix keySet->entrySet transition in ItemPathHolder


  Commit: c81b95da23c35830208673f94d8f530e5e67371b
      https://github.com/Evolveum/midpoint/commit/c81b95da23c35830208673f94d8f530e5e67371b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

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


  Commit: 52550b1d2e9f858d90f1f9e34ab942c62efe7714
      https://github.com/Evolveum/midpoint/commit/52550b1d2e9f858d90f1f9e34ab942c62efe7714
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

  Log Message:
  -----------
  Fix URL->URI transition test failures

(at least some of them)


  Commit: 23d4d58867fe3564c9fdd414dbbf44e98f0927df
      https://github.com/Evolveum/midpoint/commit/23d4d58867fe3564c9fdd414dbbf44e98f0927df
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/resources/notifications/system-configuration.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java

  Log Message:
  -----------
  Add test for multivalued recipientExpression

Also added toList and encodedToList variables in SimpleSmsTransport.


  Commit: 855914f990ad2815bd39a32c5b95ee3a852c872b
      https://github.com/Evolveum/midpoint/commit/855914f990ad2815bd39a32c5b95ee3a852c872b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

  Log Message:
  -----------
  fixed ucf module tests


  Commit: e11793b0ca57d47253273d166825abfa7b218182
      https://github.com/Evolveum/midpoint/commit/e11793b0ca57d47253273d166825abfa7b218182
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/resources/notifications/system-configuration.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint

# Conflicts:
#	provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java


  Commit: 6445476654c70ce35b5e22e87ae5aa37c2f4c353
      https://github.com/Evolveum/midpoint/commit/6445476654c70ce35b5e22e87ae5aa37c2f4c353
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java

  Log Message:
  -----------
  Add 'assign role' notification test

The idea is to catch "Target: approvalroletest1 (dummy) [owner]"
style texts but unfortunately they do not occur in usual cases.


  Commit: 6d0d9673498652ac51785e356307274926114f0a
      https://github.com/Evolveum/midpoint/commit/6d0d9673498652ac51785e356307274926114f0a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Distinct option in adminGuiConfig


  Commit: 495777367bf330ab89803ddfc53fff2f956df097
      https://github.com/Evolveum/midpoint/commit/495777367bf330ab89803ddfc53fff2f956df097
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


  Commit: 768b0666ab092020fc27aad3d579276e3bb6cdf9
      https://github.com/Evolveum/midpoint/commit/768b0666ab092020fc27aad3d579276e3bb6cdf9
  Author: Michael Gruber <michael.gruber at wwk.de>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java

  Log Message:
  -----------
  MID-4567


  Commit: 154ff05e7dc5fdca897df19e37b09b5646067077
      https://github.com/Evolveum/midpoint/commit/154ff05e7dc5fdca897df19e37b09b5646067077
  Author: Michael Gruber <michael.gruber at wwk.de>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml

  Log Message:
  -----------
  test for MID-4567


  Commit: 268abcbea290db5fc7cd213ec4709e19274ea707
      https://github.com/Evolveum/midpoint/commit/268abcbea290db5fc7cd213ec4709e19274ea707
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Adding TestReconNullValue to story test suite and fixing mapping strength


  Commit: fa93d132ffec84eebfab3501ea653b270b8ea34f
      https://github.com/Evolveum/midpoint/commit/fa93d132ffec84eebfab3501ea653b270b8ea34f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  cleanup in repository cache, global cache moved after "local" cache, fixed cloning based on readonly flag


  Commit: a6bf2e8fe4b9f80c60f51d819c42ab830dffeae5
      https://github.com/Evolveum/midpoint/commit/a6bf2e8fe4b9f80c60f51d819c42ab830dffeae5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/model-intest/src/test/resources/notifications/system-configuration.xml
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategyFactory.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestPartitioning.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkBucketStrategies.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkersManagement.java
    M samples/model-client-sample/pom.xml
    M samples/policy/meta/policies-meta-approval.xml
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/auth-caching

# Conflicts:
#	repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java


  Commit: 276b5b61c351a24b615e25a9366bccc7dbdd2df9
      https://github.com/Evolveum/midpoint/commit/276b5b61c351a24b615e25a9366bccc7dbdd2df9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  code cleanup


  Commit: f4145afeb8c3db7f55a4984ce08a85aacd05f9ac
      https://github.com/Evolveum/midpoint/commit/f4145afeb8c3db7f55a4984ce08a85aacd05f9ac
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  fixing TestUnix


  Commit: bec2460b1291d58db12f2fa547036821cb97b880
      https://github.com/Evolveum/midpoint/commit/bec2460b1291d58db12f2fa547036821cb97b880
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  authentication caching improved assignments loading


  Commit: 817e6231df23b080d43d8344ad5bbd3116bc283d
      https://github.com/Evolveum/midpoint/commit/817e6231df23b080d43d8344ad5bbd3116bc283d
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java

  Log Message:
  -----------
  MID-4471 delete assignment button authorization


  Commit: bb598267078e984f72a650c70768a98db3733d49
      https://github.com/Evolveum/midpoint/commit/bb598267078e984f72a650c70768a98db3733d49
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 0c352838c3a738e8ca3d3be2efc27678a7d6bbf7
      https://github.com/Evolveum/midpoint/commit/0c352838c3a738e8ca3d3be2efc27678a7d6bbf7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java

  Log Message:
  -----------
  fixing TestRetirement


  Commit: 8831df4273daab2654de712313551f987fe0a977
      https://github.com/Evolveum/midpoint/commit/8831df4273daab2654de712313551f987fe0a977
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  fixing TestTrafo


  Commit: 0a3b3d95f1458ba71b468267237286631ac9864f
      https://github.com/Evolveum/midpoint/commit/0a3b3d95f1458ba71b468267237286631ac9864f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java

  Log Message:
  -----------
  fixing TestMachineIntelligence


  Commit: 18cebeac4f3df3149d78e0104b5d37574b141c88
      https://github.com/Evolveum/midpoint/commit/18cebeac4f3df3149d78e0104b5d37574b141c88
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json

  Log Message:
  -----------
  Missing JSON files for REST tests


  Commit: cda6af506465c7a221fc755620361056d0388ee3
      https://github.com/Evolveum/midpoint/commit/cda6af506465c7a221fc755620361056d0388ee3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: cd3cbcb613ea7b1836b77954d72a40fc4effa5f8
      https://github.com/Evolveum/midpoint/commit/cd3cbcb613ea7b1836b77954d72a40fc4effa5f8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java

  Log Message:
  -----------
  Use 'distinct' when displaying objects (MID-3955)

The GUI uses 'distinct' search option when displaying objects, unless
disabled in the system configuration.

Important change in repo: query interpreter now optimizes usage of
'distinct'. If there are no joins, distinct is not applied even if
requested. This heuristic would need to be changed if it would be
found to be ineffective (see e.g.
QueryInterpreter2Test.test0350QuerySubtreeDistinctCount).


  Commit: a029c5c318c87fe08eb3c1df3cc40afd293aa135
      https://github.com/Evolveum/midpoint/commit/a029c5c318c87fe08eb3c1df3cc40afd293aa135
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml

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


  Commit: f2117751cd1669a6ff113adb6ad2e7ee51cc87db
      https://github.com/Evolveum/midpoint/commit/f2117751cd1669a6ff113adb6ad2e7ee51cc87db
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java

  Log Message:
  -----------
  Add button fix on the construction details panel


  Commit: 79acd3179677839da4657a8efea300631e5933ed
      https://github.com/Evolveum/midpoint/commit/79acd3179677839da4657a8efea300631e5933ed
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java

  Log Message:
  -----------
  CSV connector switched to version 2.2


  Commit: f60c3a1bc6e942a29bc754f564fdb05a4cbe50d5
      https://github.com/Evolveum/midpoint/commit/f60c3a1bc6e942a29bc754f564fdb05a4cbe50d5
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 8631eb05b9fa43ec1f9a6e44c291ccd6e3b0111c
      https://github.com/Evolveum/midpoint/commit/8631eb05b9fa43ec1f9a6e44c291ccd6e3b0111c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  clone fix in repo cache


  Commit: dd921f24a3e22a5cdadba5d971e91fa2d976b85a
      https://github.com/Evolveum/midpoint/commit/dd921f24a3e22a5cdadba5d971e91fa2d976b85a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: bfcc7a29f0ba93de62839822475776f691a51c27
      https://github.com/Evolveum/midpoint/commit/bfcc7a29f0ba93de62839822475776f691a51c27
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

  Log Message:
  -----------
  Change work allocation contention resolution

>From linear to truncated exponential backoff. It should now scale
better for many worker threads. Changed task manager configuration
fields (renamed: workAllocationMaxRetries,
new: workAllocationRetryExponentialThreshold). Unified backoff
algorithm with the one used in repository service.

Also fixed the problem of hanging of tasks hit by allocation failures.


  Commit: f55e07d65ec83a93ae301653aabc775d7383d92d
      https://github.com/Evolveum/midpoint/commit/f55e07d65ec83a93ae301653aabc775d7383d92d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

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


  Commit: 4e98efff36d81e5abdf078b0b7fddf0625994a35
      https://github.com/Evolveum/midpoint/commit/4e98efff36d81e5abdf078b0b7fddf0625994a35
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/auth-caching

# Conflicts:
#	repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java


  Commit: 55a34ee9c4f229ad5ccc7327b268b75d4b30d7b0
      https://github.com/Evolveum/midpoint/commit/55a34ee9c4f229ad5ccc7327b268b75d4b30d7b0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Story test for existential issues (MID-4564)


  Commit: 61c13393656fa9fdd92a0110e31cd8f5c63b377e
      https://github.com/Evolveum/midpoint/commit/61c13393656fa9fdd92a0110e31cd8f5c63b377e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/auth-caching

# Conflicts:
#	repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java


  Commit: cecc6d3a60cbe497bf71e7da11b32f0f6f8ceeab
      https://github.com/Evolveum/midpoint/commit/cecc6d3a60cbe497bf71e7da11b32f0f6f8ceeab
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/WizardIssuesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/XmlEntityResolverImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationClosingTaskHandler.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/ProfilingModelInspector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/model-intest/src/test/resources/notifications/system-configuration.xml
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PolicyRuleApplication.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestPartitioning.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkBucketStrategies.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkersManagement.java
    M samples/policy/meta/policies-meta-approval.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge commit 'f55e07d65ec83a93ae301653aabc775d7383d92d' into feature/performance-stable


  Commit: 5bb31e6e4ead6bb27bd9ef68952f088982811212
      https://github.com/Evolveum/midpoint/commit/5bb31e6e4ead6bb27bd9ef68952f088982811212
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PropertyConstraintTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java

  Log Message:
  -----------
  fixing MID-4552  system configuration page (system) in GUI destroyed defaultObjectPolicyConfiguration


  Commit: 88bb787829ae7a81501b2999c348b20822afefb6
      https://github.com/Evolveum/midpoint/commit/88bb787829ae7a81501b2999c348b20822afefb6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 5ee27a1f905a443abfa3436d123114ea2c932305
      https://github.com/Evolveum/midpoint/commit/5ee27a1f905a443abfa3436d123114ea2c932305
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java

  Log Message:
  -----------
  Disable TestDelivery.test150Assign_IT_5

The test code should be fixed; I would suggest looking at library.xml.

(cherry picked from commit 1cce61b)


  Commit: 54e9eb871140514ab1675027b93ff1bc85eb864c
      https://github.com/Evolveum/midpoint/commit/54e9eb871140514ab1675027b93ff1bc85eb864c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PropertyConstraintTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

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


  Commit: e5a982360e87e52ebbb514aa2c57400690e9c557
      https://github.com/Evolveum/midpoint/commit/e5a982360e87e52ebbb514aa2c57400690e9c557
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

  Log Message:
  -----------
  fixing GUI tests


  Commit: c5b6f1866397b2587c4eee916e531d7a10485cd7
      https://github.com/Evolveum/midpoint/commit/c5b6f1866397b2587c4eee916e531d7a10485cd7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: a1215783e5f6e9e45d79970c045be61b2d5607d0
      https://github.com/Evolveum/midpoint/commit/a1215783e5f6e9e45d79970c045be61b2d5607d0
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java

  Log Message:
  -----------
  code refactoring


  Commit: fd658324347a99b158c9982f28bba7f46f9aa507
      https://github.com/Evolveum/midpoint/commit/fd658324347a99b158c9982f28bba7f46f9aa507
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PropertyConstraintTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 10319fb17cf0bdc2811686812123ea0f45457ad8
      https://github.com/Evolveum/midpoint/commit/10319fb17cf0bdc2811686812123ea0f45457ad8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheObject.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  fix in caching


  Commit: fb9c3ffaf86c74d1b73dddceefa0b2fbc16839ed
      https://github.com/Evolveum/midpoint/commit/fb9c3ffaf86c74d1b73dddceefa0b2fbc16839ed
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PropertyConstraintTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge commit 'fd658324347a99b158c9982f28bba7f46f9aa507' into feature/auth-caching


  Commit: a3db033a1f466ef5319bb58cb4c40716ef567d3e
      https://github.com/Evolveum/midpoint/commit/a3db033a1f466ef5319bb58cb4c40716ef567d3e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyConfigurationTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PropertyConstraintTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestExistentialIssues.java
    A testing/story/src/test/resources/existential/resource-dummy-lazy.xml
    A testing/story/src/test/resources/existential/user-descartes.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Merge commit 'fd658324347a99b158c9982f28bba7f46f9aa507' into feature/performance-stable


  Commit: e8488d4bde1f8891a9d3c8002d25db15bd3adc39
      https://github.com/Evolveum/midpoint/commit/e8488d4bde1f8891a9d3c8002d25db15bd3adc39
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  caching configuration in system configuration type


  Commit: bf9db50cb883f736d5658026aa9d348038b2f5ea
      https://github.com/Evolveum/midpoint/commit/bf9db50cb883f736d5658026aa9d348038b2f5ea
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M repo/repo-cache/pom.xml
    R repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheKey.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/CacheObject.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/feature/auth-caching' into feature/performance-stable


  Commit: b1202e1e0b4aeed7c2404bccd5c841afe3cddbb9
      https://github.com/Evolveum/midpoint/commit/b1202e1e0b4aeed7c2404bccd5c841afe3cddbb9
  Author: Jonathan Hill <jhill at exclamationlabs.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  Update case item menu item visibility


  Commit: a4fb63ae1b37b7d592c1e1af946d4e612bf21546
      https://github.com/Evolveum/midpoint/commit/a4fb63ae1b37b7d592c1e1af946d4e612bf21546
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  Merge pull request #79 from ExclamationLabs/feature/cases-ui-3.8

Update case item menu item visibility


  Commit: 215ab2d533363891881c37acc50e88e99bdb9dc2
      https://github.com/Evolveum/midpoint/commit/215ab2d533363891881c37acc50e88e99bdb9dc2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java

  Log Message:
  -----------
  MID-4583 audit target owner type changed to FocusType. added one column


  Commit: 445a1acd82366251295382a67d42dd79c7c61fa3
      https://github.com/Evolveum/midpoint/commit/445a1acd82366251295382a67d42dd79c7c61fa3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql

  Log Message:
  -----------
  MID-4583 audit target owner type, sql scripts updated


  Commit: 04300bd02159e6bb771d1814e7c7d2d83d5110dc
      https://github.com/Evolveum/midpoint/commit/04300bd02159e6bb771d1814e7c7d2d83d5110dc
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: d1894a4b9de3bcf285661567ea9f6db086efdb51
      https://github.com/Evolveum/midpoint/commit/d1894a4b9de3bcf285661567ea9f6db086efdb51
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResumeExecutor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/scripting/resume-suspended-tasks.xml
    A model/model-intest/src/test/resources/scripting/task-to-keep-suspended.xml
    A model/model-intest/src/test/resources/scripting/task-to-resume.xml

  Log Message:
  -----------
  Add "resume" bulk action

Also created a sample bulk action to resume tasks carrying
failed executions of recently approved requests.

Fixes MID-4469.

(cherry picked from commit 2610fc4)


  Commit: 58490b99bca1e007466a64cb85bd9e98befee48b
      https://github.com/Evolveum/midpoint/commit/58490b99bca1e007466a64cb85bd9e98befee48b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java

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


  Commit: 82bd46e12abc82f1fe1c12417cf56f5a6105121f
      https://github.com/Evolveum/midpoint/commit/82bd46e12abc82f1fe1c12417cf56f5a6105121f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingTimeEval.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-peru.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-yellow.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    A model/model-intest/src/test/resources/multi/role-dark-yellow-peru.xml
    R model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing tricky dependencies bug (MID-4554)


  Commit: 92b9b29c460784a53c38f291d5e25a8795d34873
      https://github.com/Evolveum/midpoint/commit/92b9b29c460784a53c38f291d5e25a8795d34873
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/resources/localization/schema_en.properties

  Log Message:
  -----------
  Translation sync. New language: French!

Thanks to all that contributed: charles.dc.chen (zh_CN), petr.gasparik (cs), rpudil (cs), StéphaneA (fr), wstaszewski pl)


  Commit: 179fc9301b4fa5afbfaa83139a41acfe62a3884f
      https://github.com/Evolveum/midpoint/commit/179fc9301b4fa5afbfaa83139a41acfe62a3884f
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    A infra/schema/src/main/resources/localization/schema_fr.properties

  Log Message:
  -----------
  New language - French


  Commit: 75b5c269e91e829499f04fcb5ccf7481b158c444
      https://github.com/Evolveum/midpoint/commit/75b5c269e91e829499f04fcb5ccf7481b158c444
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test305GreaterOrEqual.xml

  Log Message:
  -----------
  Fix greaterOrEqual/lessOrEqual dump (MID-4581)

(cherry picked from commit f8f8691)


  Commit: d796298bfa31aaa4e5298b0468ce178b0ee28cfd
      https://github.com/Evolveum/midpoint/commit/d796298bfa31aaa4e5298b0468ce178b0ee28cfd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_fr.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingTimeEval.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-peru.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-yellow.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    A model/model-intest/src/test/resources/multi/role-dark-yellow-peru.xml
    R model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 178b2acb8f81630ecb0dfa311f546ab3547f7a1d
      https://github.com/Evolveum/midpoint/commit/178b2acb8f81630ecb0dfa311f546ab3547f7a1d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java

  Log Message:
  -----------
  Fix compilation error


  Commit: 3a363e82a87305012458507ff8571bc17ef3a1aa
      https://github.com/Evolveum/midpoint/commit/3a363e82a87305012458507ff8571bc17ef3a1aa
  Author: Michael Gruber <michael.gruber at wwk.de>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml

  Log Message:
  -----------
  use givenName
fixed documentation


  Commit: 6b206431cc868cf298ae20cb0307c80b932b8b41
      https://github.com/Evolveum/midpoint/commit/6b206431cc868cf298ae20cb0307c80b932b8b41
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml

  Log Message:
  -----------
  Correcting and extending the TestReconNullValue test


  Commit: 15ca28da740cdefb5a1394bcb8f28913f8fab7f6
      https://github.com/Evolveum/midpoint/commit/15ca28da740cdefb5a1394bcb8f28913f8fab7f6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java

  Log Message:
  -----------
  Fix assignment deletion notifications (MID-4588)

We now try to resolve values for id-only PCV deletions.


  Commit: eb2df6427b788d8ecb9c6335be60ec3f56cf7d8a
      https://github.com/Evolveum/midpoint/commit/eb2df6427b788d8ecb9c6335be60ec3f56cf7d8a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/NoOpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/PartitioningTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForSubtasksByPollingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForTasksTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

  Log Message:
  -----------
  Remove casts for TaskManager implementation

It causes problems when profiling is enabled (as the autowired
object is a proxy instance instead of direct implementation class).


  Commit: 65269098ee46e23b145ec2b72741e4401490e129
      https://github.com/Evolveum/midpoint/commit/65269098ee46e23b145ec2b72741e4401490e129
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml

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


  Commit: 83e2c9c32fc1dfcc955f706a2daa82ca9b8b610d
      https://github.com/Evolveum/midpoint/commit/83e2c9c32fc1dfcc955f706a2daa82ca9b8b610d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M model/notifications-impl/pom.xml

  Log Message:
  -----------
  Add forgotten dependency


  Commit: a96a91f23512fe255d91be4166c196f6bee8fe82
      https://github.com/Evolveum/midpoint/commit/a96a91f23512fe255d91be4166c196f6bee8fe82
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/NoOpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/PartitioningTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForSubtasksByPollingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForTasksTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

  Log Message:
  -----------
  Remove casts for TaskManager implementation

It causes problems when profiling is enabled (as the autowired
object is a proxy instance instead of direct implementation class).

(cherry picked from commit eb2df64)


  Commit: 89d9ba4d6c0aa715302c16973847cd5698717e6e
      https://github.com/Evolveum/midpoint/commit/89d9ba4d6c0aa715302c16973847cd5698717e6e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java

  Log Message:
  -----------
  fixed status page


  Commit: af25e85dce837b035f42f7c8b1e633478c4bb127
      https://github.com/Evolveum/midpoint/commit/af25e85dce837b035f42f7c8b1e633478c4bb127
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
    M testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml

  Log Message:
  -----------
  adding missing resources for REST tests


  Commit: 1067456e53a25e3832ca1ff949653c8d57c08849
      https://github.com/Evolveum/midpoint/commit/1067456e53a25e3832ca1ff949653c8d57c08849
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java

  Log Message:
  -----------
  another fix for rest tests


  Commit: 9d6f9b204c8e3bc51613a5cae0377c837b05e9a0
      https://github.com/Evolveum/midpoint/commit/9d6f9b204c8e3bc51613a5cae0377c837b05e9a0
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java

  Log Message:
  -----------
  expression panel code refactoring + null expression value issue fix


  Commit: b30b119800d9929b45c08886b14697ed81b06028
      https://github.com/Evolveum/midpoint/commit/b30b119800d9929b45c08886b14697ed81b06028
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test305GreaterOrEqual.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingTimeEval.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResumeExecutor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-peru.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-yellow.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    A model/model-intest/src/test/resources/multi/role-dark-yellow-peru.xml
    R model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    A model/model-intest/src/test/resources/scripting/resume-suspended-tasks.xml
    A model/model-intest/src/test/resources/scripting/task-to-keep-suspended.xml
    A model/model-intest/src/test/resources/scripting/task-to-resume.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/NoOpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/PartitioningTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForSubtasksByPollingTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForTasksTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
    M testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: f3d0e918ac8d921a311dc4ed376e192249b68225
      https://github.com/Evolveum/midpoint/commit/f3d0e918ac8d921a311dc4ed376e192249b68225
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/BaseWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategy.java

  Log Message:
  -----------
  Fix minor issues in work buckets management


  Commit: 44d9226ba0191de35c3921cdbadfe35e5f83835e
      https://github.com/Evolveum/midpoint/commit/44d9226ba0191de35c3921cdbadfe35e5f83835e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
    M testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml

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


  Commit: 8d68d7c03ae905d10f5e2a9a132d5246dea36f79
      https://github.com/Evolveum/midpoint/commit/8d68d7c03ae905d10f5e2a9a132d5246dea36f79
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java

  Log Message:
  -----------
  Fix missing words in full text indexing (MID-4590)

(cherry picked from commit 970de28)


  Commit: 5205d64b1c0c7da725f33b7b3b0be29dee7d6535
      https://github.com/Evolveum/midpoint/commit/5205d64b1c0c7da725f33b7b3b0be29dee7d6535
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java

  Log Message:
  -----------
  MID-4525 fix


  Commit: 534da404a5f172cd6b47f3adfa12e602f08573ac
      https://github.com/Evolveum/midpoint/commit/534da404a5f172cd6b47f3adfa12e602f08573ac
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/BaseWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategy.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: ba39ef41780069b3ee1256d6dd4f2a4f8687dda4
      https://github.com/Evolveum/midpoint/commit/ba39ef41780069b3ee1256d6dd4f2a4f8687dda4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java

  Log Message:
  -----------
  Fix large operation results for multinode tasks

Temporary solution: for each bucket we start with new operation result.
If the previous one was not a success, we dump it into the log.


  Commit: 389311cd87ffa6d655f52a024875bf827fa7fac0
      https://github.com/Evolveum/midpoint/commit/389311cd87ffa6d655f52a024875bf827fa7fac0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java

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


  Commit: 3f2bc60f67fec6ca20868fbbfb3e9a22df53d471
      https://github.com/Evolveum/midpoint/commit/3f2bc60f67fec6ca20868fbbfb3e9a22df53d471
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test305GreaterOrEqual.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingTimeEval.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResumeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-peru.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-dark-yellow.xml
    R model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    A model/model-intest/src/test/resources/multi/role-dark-yellow-peru.xml
    R model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    A model/model-intest/src/test/resources/scripting/resume-suspended-tasks.xml
    A model/model-intest/src/test/resources/scripting/task-to-keep-suspended.xml
    A model/model-intest/src/test/resources/scripting/task-to-resume.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/BaseWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/WorkSegmentationStrategy.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
    M testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
    A testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/resources/recon-null-value/resource-opendj.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/performance-stable

# Conflicts:
#	repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java


  Commit: b4deff761aea82861e6d0023b6e55645defd3cad
      https://github.com/Evolveum/midpoint/commit/b4deff761aea82861e6d0023b6e55645defd3cad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/TaskService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WorkersCreationTaskHandler.java
    A repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java
    A samples/tasks/task-user-recompute-multinode.xml

  Log Message:
  -----------
  Add first implementation of reconcileWorkers

It is quite limited; in particular it leaves superfluous workers
in suspended state that prevents coordinator from successful restarts.
(Probably they should be closed.)


  Commit: dcca6f41c70eaae9687b2ef8cf90d897f6c2f952
      https://github.com/Evolveum/midpoint/commit/dcca6f41c70eaae9687b2ef8cf90d897f6c2f952
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/WorkersReconciliationOptions.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WorkersCreationTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java

  Log Message:
  -----------
  Enhance reconcileWorkers action

1) Superfluous tasks are now closed (not suspended) so the parent can
stop waiting for them.
2) For the same reason also the regular (matching) workers are closed
if the work is done.

Plus some minor fixes.


  Commit: 3f8b29a33cd4705507b40a41b6d37077a9bc6851
      https://github.com/Evolveum/midpoint/commit/3f8b29a33cd4705507b40a41b6d37077a9bc6851
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/EntityRegistry.java

  Log Message:
  -----------
  MID-4596 fixed operation execution handling


  Commit: 04422b5a72d5958d0a8d67ef98a2aa06fb4bc05d
      https://github.com/Evolveum/midpoint/commit/04422b5a72d5958d0a8d67ef98a2aa06fb4bc05d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/WorkersReconciliationOptions.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WorkersCreationTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 58bca47f3b377c7758305c3e2beb1b63c4dabb37
      https://github.com/Evolveum/midpoint/commit/58bca47f3b377c7758305c3e2beb1b63c4dabb37
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Upgrade JasperReports to 6.5.0

According to TIBCO Security Advisory 2018-5429.


  Commit: a7b31c9bcf25f01b48e667247aff918eecc0e36d
      https://github.com/Evolveum/midpoint/commit/a7b31c9bcf25f01b48e667247aff918eecc0e36d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java

  Log Message:
  -----------
  Fix Users report

It failed for a user with assignment of a focus mapping.


  Commit: 5e3a9a0a8363a86d05084f6b2a3640c6e110aa90
      https://github.com/Evolveum/midpoint/commit/5e3a9a0a8363a86d05084f6b2a3640c6e110aa90
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java

  Log Message:
  -----------
  Fix User page (temporarily)

It failed for a user containing assignment of a focus mapping.


  Commit: a8bb16f00a5fee81405154cc830167d9078cfa7c
      https://github.com/Evolveum/midpoint/commit/a8bb16f00a5fee81405154cc830167d9078cfa7c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/EntityRegistry.java

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


  Commit: 80f5308ff4c608cf81fa88f5a739d9756c000035
      https://github.com/Evolveum/midpoint/commit/80f5308ff4c608cf81fa88f5a739d9756c000035
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java

  Log Message:
  -----------
  restricting of expression panel usage


  Commit: 4d0eebf8fb02feffb25d32a3278fc87744a4f2fe
      https://github.com/Evolveum/midpoint/commit/4d0eebf8fb02feffb25d32a3278fc87744a4f2fe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    A samples/objects/function-library-mail-templates.xml
    A samples/objects/system-configuration-multilanguage-notifier.xml

  Log Message:
  -----------
  Multi-language notificaitons + velocity templates in function library (untested)


  Commit: f80c5e6217fbf6594c0f80510750c3ab6702bdd0
      https://github.com/Evolveum/midpoint/commit/f80c5e6217fbf6594c0f80510750c3ab6702bdd0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M samples/objects/system-configuration-multilanguage-notifier.xml

  Log Message:
  -----------
  Multilanguage notifications fixes


  Commit: d81653c062aee0d12323a99d4e754466e4a50924
      https://github.com/Evolveum/midpoint/commit/d81653c062aee0d12323a99d4e754466e4a50924
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

  Log Message:
  -----------
  Add contention-related logging

The logs are used to trace concurrency issues in repository and during
work bucket allocation.


  Commit: 2b65837442a37561aee046ac9ac7ac9224aea5d4
      https://github.com/Evolveum/midpoint/commit/2b65837442a37561aee046ac9ac7ac9224aea5d4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    A samples/objects/function-library-mail-templates.xml
    A samples/objects/system-configuration-multilanguage-notifier.xml

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


  Commit: 539090e8a0a866c9a967e3d761c82a49b5472527
      https://github.com/Evolveum/midpoint/commit/539090e8a0a866c9a967e3d761c82a49b5472527
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/TaskService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/EntityRegistry.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/WorkersReconciliationOptions.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WorkersCreationTaskHandler.java
    A repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/workers/WorkersManager.java
    A samples/tasks/task-user-recompute-multinode.xml

  Log Message:
  -----------
  Merge commit 'a8bb16f00a5fee81405154cc830167d9078cfa7c' into feature/performance-stable


  Commit: 6ca95690ad8bffeb4ac421e43a30300ca1dacea3
      https://github.com/Evolveum/midpoint/commit/6ca95690ad8bffeb4ac421e43a30300ca1dacea3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    A samples/objects/function-library-mail-templates.xml
    A samples/objects/system-configuration-multilanguage-notifier.xml

  Log Message:
  -----------
  Merge commit '2b65837442a37561aee046ac9ac7ac9224aea5d4' into feature/performance-stable


  Commit: b10121de5e2a5455e25578b1af3f3599ab2717f3
      https://github.com/Evolveum/midpoint/commit/b10121de5e2a5455e25578b1af3f3599ab2717f3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java

  Log Message:
  -----------
  fixing MID-4594 Nonce timestamp is not stored in User object


  Commit: 1079c46c9473fb7ae6b3ae69c4319cb949bfa7ac
      https://github.com/Evolveum/midpoint/commit/1079c46c9473fb7ae6b3ae69c4319cb949bfa7ac
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    A samples/objects/function-library-mail-templates.xml
    A samples/objects/system-configuration-multilanguage-notifier.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: dc7561b67fef9fa7078041fb5fe02ddc4e4d2303
      https://github.com/Evolveum/midpoint/commit/dc7561b67fef9fa7078041fb5fe02ddc4e4d2303
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/TaskService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Add tree-wide task suspend/resume actions

Now the multi-worker task trees can be suspended and resumed as a whole.
(Coordinator-only suspend and resume is available from the task context
menu for multi-worker tasks. It is intended to be used only on
special occasions.)


  Commit: 0148d82a808f3abd812a2b7fd977de9e5461d63d
      https://github.com/Evolveum/midpoint/commit/0148d82a808f3abd812a2b7fd977de9e5461d63d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java

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


  Commit: cecc90a5bd997c862266043987559e7b7a22a656
      https://github.com/Evolveum/midpoint/commit/cecc90a5bd997c862266043987559e7b7a22a656
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-21 (Sat, 21 Apr 2018)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java

  Log Message:
  -----------
  Add missing task manager configuration key


  Commit: ee8dcb3738f9e897488c31502256913f9a1ec2c1
      https://github.com/Evolveum/midpoint/commit/ee8dcb3738f9e897488c31502256913f9a1ec2c1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/TaskService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java

  Log Message:
  -----------
  Merge commit 'cecc90a5bd997c862266043987559e7b7a22a656' into feature/performance-stable


  Commit: e63cf3141f0e47b8cc249d7916568bcdc4dcdd15
      https://github.com/Evolveum/midpoint/commit/e63cf3141f0e47b8cc249d7916568bcdc4dcdd15
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java

  Log Message:
  -----------
  temporary fix for MID-4613


Compare: https://github.com/Evolveum/midpoint/compare/57c6a4fb5e12...e63cf3141f0e