[midPoint-git] [Evolveum/midpoint] 15dd45: induced entitlements panel, columns are fixed

Wed Apr 11 14:20:24 CEST 2018

  Branch: refs/heads/feature/auth-caching
  Home:   https://github.com/Evolveum/midpoint
  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: 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: 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: 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: 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: 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: 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: 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

Compare: https://github.com/Evolveum/midpoint/compare/39e395e97e55...276b5b61c351