[midPoint-git] [Evolveum/midpoint] 1672e9: policy rule name fix (MID-4647)

Tue May 29 11:05:19 CEST 2018

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1672e9749989ec2254950569b1ea20ffe4730509
      https://github.com/Evolveum/midpoint/commit/1672e9749989ec2254950569b1ea20ffe4730509
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

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

  Log Message:
  -----------
  policy rule name fix (MID-4647)

  Commit: abaa23c21145188270a89f3a8a02d4341efed6d8
      https://github.com/Evolveum/midpoint/commit/abaa23c21145188270a89f3a8a02d4341efed6d8
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
    M gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    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
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/common/role-persona-admin.xml
    M model/model-intest/src/test/resources/security/role-application-1.xml
    M model/model-intest/src/test/resources/security/role-application-2.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/model-intest/src/test/resources/security/role-assign-application-roles.xml
    M model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml
    M model/model-intest/src/test/resources/security/role-business-1.xml
    M model/model-intest/src/test/resources/security/role-business-2.xml
    M model/model-intest/src/test/resources/security/role-business-3.xml
    M model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml
    M model/model-intest/src/test/resources/security/role-expression-read-roles.xml
    M model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/model-intest/src/test/resources/security/role-persona-management.xml
    M model/model-intest/src/test/resources/security/role-read-some-roles.xml
    M model/model-intest/src/test/resources/security/role-vault-dweller.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M samples/policy/meta/policies-meta-approval.xml

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

  Commit: 4a2bf6f29f21f81a48fde35e465fc1cc604cef46
      https://github.com/Evolveum/midpoint/commit/4a2bf6f29f21f81a48fde35e465fc1cc604cef46
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M build-system/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.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/util/TemporaryTableDialect.java

  Log Message:
  -----------
  temp table create fixed

  Commit: f57d83bf6948f9680ad0e967775fd58e329e3887
      https://github.com/Evolveum/midpoint/commit/f57d83bf6948f9680ad0e967775fd58e329e3887
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.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
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/schema/src/main/resources/localization/schema_en.properties

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

  Commit: dd97ba90f9856f3658c9229d293178d0f41952f6
      https://github.com/Evolveum/midpoint/commit/dd97ba90f9856f3658c9229d293178d0f41952f6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

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

  Log Message:
  -----------
  MID-4645 loading list of locales fix

  Commit: a55f9236c45c736405aa4d2728b0cb04214ba4ad
      https://github.com/Evolveum/midpoint/commit/a55f9236c45c736405aa4d2728b0cb04214ba4ad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.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/handlers/NoOpTaskHandler.java

  Log Message:
  -----------
  Fix wrong handlers for some tasks (MID-4634)

The taskManager.getHandlerUriForCategory() method wasn't assuming we
can have multiple URIs for a given task handler.

  Commit: 5d7c89e770fb9a75d3976f874b1ab3a7c2d15763
      https://github.com/Evolveum/midpoint/commit/5d7c89e770fb9a75d3976f874b1ab3a7c2d15763
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

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

  Log Message:
  -----------
  improved update log levels

  Commit: f332e4ce711eae4f1508ae393ed81133d2cd7797
      https://github.com/Evolveum/midpoint/commit/f332e4ce711eae4f1508ae393ed81133d2cd7797
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

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

  Log Message:
  -----------
  subType -> subtype fix

  Commit: da4ee616a371a62adcdae0bd65ba747ee14654d6
      https://github.com/Evolveum/midpoint/commit/da4ee616a371a62adcdae0bd65ba747ee14654d6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    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/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.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/RAnyConverter.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/dictionary/ExtItemDictionary.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/ObjectDeltaUpdater.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/resolution/ItemPathResolver.java

  Log Message:
  -----------
  another attempt to fix ext items dictionary, transaction isolation changed to repeatable_read for h2 and postgresql

  Commit: f39f6706832577c8d3b147faf8010838df355fd6
      https://github.com/Evolveum/midpoint/commit/f39f6706832577c8d3b147faf8010838df355fd6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

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

  Log Message:
  -----------
  Add ObjectType.subtype to properties (MID-4642)

  Commit: 45d5b3a73d778b08369d4c43497c7c7d16fba6e8
      https://github.com/Evolveum/midpoint/commit/45d5b3a73d778b08369d4c43497c7c7d16fba6e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.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

  Log Message:
  -----------
  Honor 'overwrite' option for tasks (MID-3885)

This option was lost on the way from model to repository
because the task manager API did not provide means for
RepoAddOptions.

  Commit: 503bfd513ed371b8bba4c485b018fbb50cac7cc4
      https://github.com/Evolveum/midpoint/commit/503bfd513ed371b8bba4c485b018fbb50cac7cc4
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

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

  Log Message:
  -----------
  MID-4649 GUI Users List - reloads permanently

  Commit: 38833d2834d37211e09460d9a26736ac19bf118a
      https://github.com/Evolveum/midpoint/commit/38833d2834d37211e09460d9a26736ac19bf118a
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.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/schema/src/main/resources/localization/schema.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.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/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.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/SqlRepositoryConfiguration.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/RAnyConverter.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/dictionary/ExtItemDictionary.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/ObjectDeltaUpdater.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/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.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/handlers/NoOpTaskHandler.java

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

  Commit: 053df7e913632a8390df3a469df36faccfa89a4e
      https://github.com/Evolveum/midpoint/commit/053df7e913632a8390df3a469df36faccfa89a4e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

  Log Message:
  -----------
  transaction isolation reverted for h2 to serializable

  Commit: 463c357d546fb967aaf26f06207710c827d96707
      https://github.com/Evolveum/midpoint/commit/463c357d546fb967aaf26f06207710c827d96707
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java

  Log Message:
  -----------
  Resolve import filters in bulk modify actions

Preliminary solution of MID-4138: filters in deltas are resolved just
before they are applied to objects via "modify" bulk action.

  Commit: 449e24dc895dc0a5ee240f77ac137889a7504c4f
      https://github.com/Evolveum/midpoint/commit/449e24dc895dc0a5ee240f77ac137889a7504c4f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

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

  Commit: 8718a4e0c3ce8565f55ebc1dc23766cd26e775e8
      https://github.com/Evolveum/midpoint/commit/8718a4e0c3ce8565f55ebc1dc23766cd26e775e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/QueryInterpreter2Test.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/RAExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.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/resolution/ItemPathResolver.java

  Log Message:
  -----------
  Remove R*Ext* -> RExtItem association

Now we keep only the identifier in R*Ext* entities.

TODO: create foreign keys by annotations

  Commit: d518a243c20aa4b9beef5608b833559d28842a61
      https://github.com/Evolveum/midpoint/commit/d518a243c20aa4b9beef5608b833559d28842a61
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  postgresql upgrade script

  Commit: e34244e1a252dc9feedd38fd95c8b317433d0552
      https://github.com/Evolveum/midpoint/commit/e34244e1a252dc9feedd38fd95c8b317433d0552
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java

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

  Commit: b7a4e98aef8a17ca3fc6cbe1b8751b0a027e923b
      https://github.com/Evolveum/midpoint/commit/b7a4e98aef8a17ca3fc6cbe1b8751b0a027e923b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  postgresql upgrade script, fixes

  Commit: 33d7dfa1c9e03bb245597d83486c34eaeed7533a
      https://github.com/Evolveum/midpoint/commit/33d7dfa1c9e03bb245597d83486c34eaeed7533a
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

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

  Log Message:
  -----------
  org tree panel, expand/collapse all fix

  Commit: 76fcb56c1302f634cb4007c968d563b323a0d99b
      https://github.com/Evolveum/midpoint/commit/76fcb56c1302f634cb4007c968d563b323a0d99b
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

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

  Commit: 3d57e931c2a6e6edb508bb8c16679c9927d63022
      https://github.com/Evolveum/midpoint/commit/3d57e931c2a6e6edb508bb8c16679c9927d63022
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  lowered log level for resolved compression issues

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

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

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

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

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/QueryInterpreter2Test.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/RAExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.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/resolution/ItemPathResolver.java

  Log Message:
  -----------
  Merge branch 'feature/ext-item-id-only'

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

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

  Log Message:
  -----------
  Fix race condition during reclaiming buckets

The condition resulted in buckets being reclaimed in more workers
at once (failing TestWorkManagement.test230WorkerException).

  Commit: 4fa13ebd841546fd9aa1b547f8738482377ad59d
      https://github.com/Evolveum/midpoint/commit/4fa13ebd841546fd9aa1b547f8738482377ad59d
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

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

  Log Message:
  -----------
  MID-4656 npe fix

  Commit: 296fc2f3878c54b05d504391644bb8953be0cb84
      https://github.com/Evolveum/midpoint/commit/296fc2f3878c54b05d504391644bb8953be0cb84
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/QueryInterpreter2Test.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/RAExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.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/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

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

  Commit: d5d9a254eabdf619ed7b8f9fd2a9a9141a3f5457
      https://github.com/Evolveum/midpoint/commit/d5d9a254eabdf619ed7b8f9fd2a9a9141a3f5457
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    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/consistency/impl/ObjectAlreadyExistHandler.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fix (and test) for manual resource and consistency interactions (MID-4614)

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

  Changed paths:
    A config/sql/_all/mysql-upgrade-3.7-3.8-utf8mb4.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  mysql upgrade scripts

  Commit: 16ae2f848435049736075d5b369de5e87f741d19
      https://github.com/Evolveum/midpoint/commit/16ae2f848435049736075d5b369de5e87f741d19
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    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/consistency/impl/ObjectAlreadyExistHandler.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

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

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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestExport.java
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Add setting xsi:type when exporting objects

This is only a preliminary (approximate) solution, see the comment in
PrismMarshaller.shouldPutTypeInExportMode.

  Commit: 4caa795fdd6e5a0449172649d688447897f33c24
      https://github.com/Evolveum/midpoint/commit/4caa795fdd6e5a0449172649d688447897f33c24
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    A config/sql/_all/mysql-upgrade-3.7-3.8-utf8mb4.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    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/consistency/impl/ObjectAlreadyExistHandler.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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

  Commit: 5f432705766b02eef000169d99fd9cda51c5207b
      https://github.com/Evolveum/midpoint/commit/5f432705766b02eef000169d99fd9cda51c5207b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

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

  Log Message:
  -----------
  Set "export" option when doing export from GUI

But it doesn't work for unknown reasons ... repo currently
returns attribute definitions with isRuntimeSchema = false.

  Commit: 302fb4c1cd321e24ed391811dab0ba4306e5e011
      https://github.com/Evolveum/midpoint/commit/302fb4c1cd321e24ed391811dab0ba4306e5e011
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java

  Log Message:
  -----------
  export option for prism serializer used in ninja

  Commit: a72af1e17780ecb5b4f1ef52ab1cbd88c850371f
      https://github.com/Evolveum/midpoint/commit/a72af1e17780ecb5b4f1ef52ab1cbd88c850371f
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/NotificationConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html

  Log Message:
  -----------
  autocomplete="new-password" for password fields

  Commit: 49a5da0e0d1c3ffbe3f544fcb9877a88e3cb38d3
      https://github.com/Evolveum/midpoint/commit/49a5da0e0d1c3ffbe3f544fcb9877a88e3cb38d3
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    A config/sql/_all/mysql-upgrade-3.7-3.8-utf8mb4.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestExport.java
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    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/consistency/impl/ObjectAlreadyExistHandler.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java

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

  Commit: 198f9e6f2e2bc21df36983af786e3542ee84c378
      https://github.com/Evolveum/midpoint/commit/198f9e6f2e2bc21df36983af786e3542ee84c378
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml

  Log Message:
  -----------
  small cleanup rest tests

  Commit: d230b5964bf3272457f22e78469b17d0017e91f4
      https://github.com/Evolveum/midpoint/commit/d230b5964bf3272457f22e78469b17d0017e91f4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
    A testing/story/src/test/resources/mapleLeaf/object-template-user.xml
    M testing/story/src/test/resources/mapleLeaf/resource-opendj.xml
    A testing/story/src/test/resources/schema/mapleLeaf.xsd

  Log Message:
  -----------
  new test cases to story test - maple leaf

  Commit: e80f56a51b830a2abc32047b0a0d275f91f31f5c
      https://github.com/Evolveum/midpoint/commit/e80f56a51b830a2abc32047b0a0d275f91f31f5c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M build-system/pom.xml
    A config/sql/_all/mysql-upgrade-3.7-3.8-utf8mb4.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.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/page/admin/configuration/component/NotificationConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java
    M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
    M gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    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.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PropertyArrayList.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestExport.java
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/common/role-persona-admin.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    M model/model-intest/src/test/resources/security/role-application-1.xml
    M model/model-intest/src/test/resources/security/role-application-2.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/model-intest/src/test/resources/security/role-assign-application-roles.xml
    M model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml
    M model/model-intest/src/test/resources/security/role-business-1.xml
    M model/model-intest/src/test/resources/security/role-business-2.xml
    M model/model-intest/src/test/resources/security/role-business-3.xml
    M model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml
    M model/model-intest/src/test/resources/security/role-expression-read-roles.xml
    M model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/model-intest/src/test/resources/security/role-persona-management.xml
    M model/model-intest/src/test/resources/security/role-read-some-roles.xml
    M model/model-intest/src/test/resources/security/role-vault-dweller.xml
    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/consistency/impl/ObjectAlreadyExistHandler.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-test.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SerializationRelatedException.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/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/RepositoryContext.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/RAExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.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/any/ROExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.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/CertificationCaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.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/helpers/modify/PrismEntityMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/InterpretationContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryEngine2.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/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.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/handlers/NoOpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M samples/policy/meta/policies-meta-approval.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusProjectionsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/CogDropDown.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/DropDown.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/Table.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/self/QuickSearch.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/self/QuickSearchDropDown.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserProjectionsCog.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTableDropDown.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/self/HomePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java

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

  Commit: a5bcc27d1978e55090085a7bb9be01d6570fc2ff
      https://github.com/Evolveum/midpoint/commit/a5bcc27d1978e55090085a7bb9be01d6570fc2ff
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java

  Log Message:
  -----------
  Better error handling for LDAP authentication (MID-4518)

  Commit: 33863d69d5b34cafc8e7b4146195adf35bfe2ec0
      https://github.com/Evolveum/midpoint/commit/33863d69d5b34cafc8e7b4146195adf35bfe2ec0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java

  Log Message:
  -----------
  Clarify and fix definition.isRuntimeSchema

The current "definition" was unclear and too complex. But the
essence of isRuntimeSchema is very simple; so let's stick to it.

  Commit: 2fc70067e9a02fb4e2d7297283a053ca44b6ec26
      https://github.com/Evolveum/midpoint/commit/2fc70067e9a02fb4e2d7297283a053ca44b6ec26
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/NotificationConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
    A testing/story/src/test/resources/mapleLeaf/object-template-user.xml
    M testing/story/src/test/resources/mapleLeaf/resource-opendj.xml
    A testing/story/src/test/resources/schema/mapleLeaf.xsd

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

  Commit: 64f99a972233e04864f94464983740e2b43de988
      https://github.com/Evolveum/midpoint/commit/64f99a972233e04864f94464983740e2b43de988
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/CountOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java

  Log Message:
  -----------
  MID-4668 fixed export for shadows with non existing or null resourceRef

  Commit: 9ba411e884c9d7f212d48b4bcb856f043ebc1491
      https://github.com/Evolveum/midpoint/commit/9ba411e884c9d7f212d48b4bcb856f043ebc1491
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
    A testing/story/src/test/resources/mapleLeaf/object-template-user.xml
    M testing/story/src/test/resources/mapleLeaf/resource-opendj.xml
    A testing/story/src/test/resources/schema/mapleLeaf.xsd

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

  Commit: f334801d208178119b944f4e9319dfe81d59052b
      https://github.com/Evolveum/midpoint/commit/f334801d208178119b944f4e9319dfe81d59052b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  Fix lax filter validation at import (MID-3614)

Type and Exists filters were not validated well enough on import;
problems in them would manifest themselves only at execution time
(e.g. when authorizations were evaluated). But we need to distinguish
import (strict parsing) and repo fetch (compat parsing); so we brought
ParsingContext into filter parsing.

  Commit: e028af1b2704a7542fa6d484d82458d0c289a373
      https://github.com/Evolveum/midpoint/commit/e028af1b2704a7542fa6d484d82458d0c289a373
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    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/dto/ObjectPolicyDialogDto.java

  Log Message:
  -----------
  fixing MID-4640. Editing object policy references in System configuration from GUI adds oidBound:false

  Commit: 42bdf03b4465a84e3ec1f7b39c8225315a4afceb
      https://github.com/Evolveum/midpoint/commit/42bdf03b4465a84e3ec1f7b39c8225315a4afceb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/CountOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java

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

  Commit: c2ac2a797e2bb2b6970b14aa16472a669175fcf7
      https://github.com/Evolveum/midpoint/commit/c2ac2a797e2bb2b6970b14aa16472a669175fcf7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing some sanity tests and improving them (MID-4670)

  Commit: 591bbebb186cc370f67d29a8504973104bf133b5
      https://github.com/Evolveum/midpoint/commit/591bbebb186cc370f67d29a8504973104bf133b5
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  MID-4658 Personas tab is removed on AbstractRoleType details page

  Commit: 093e374d6f15ec2fe72b17080e869dbb3256f4ce
      https://github.com/Evolveum/midpoint/commit/093e374d6f15ec2fe72b17080e869dbb3256f4ce
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    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/dto/ObjectPolicyDialogDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/logback-test.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
    A testing/story/src/test/resources/mapleLeaf/object-template-user.xml
    M testing/story/src/test/resources/mapleLeaf/resource-opendj.xml
    A testing/story/src/test/resources/schema/mapleLeaf.xsd
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/CountOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java

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

  Commit: 7b1aea91cd9f22a6e33040bfba602d3dcf997cee
      https://github.com/Evolveum/midpoint/commit/7b1aea91cd9f22a6e33040bfba602d3dcf997cee
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

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

  Log Message:
  -----------
  little property + style fixes

  Commit: 41fae81b8a75a1d690b6c8d2e56be58a6ab8ddec
      https://github.com/Evolveum/midpoint/commit/41fae81b8a75a1d690b6c8d2e56be58a6ab8ddec
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  postgres upgrade escape fix

  Commit: 47303e10319df82018dc1ee3b9dd4cd1abff8525
      https://github.com/Evolveum/midpoint/commit/47303e10319df82018dc1ee3b9dd4cd1abff8525
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java

  Log Message:
  -----------
  ninja npe fix - removed unused code

  Commit: f931b314c8a19cc878dbebf1e86a8806c55f7477
      https://github.com/Evolveum/midpoint/commit/f931b314c8a19cc878dbebf1e86a8806c55f7477
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/AdminGuiConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

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

  Commit: b378ecd4c3019820ceec612da15d5d5b0aa7b468
      https://github.com/Evolveum/midpoint/commit/b378ecd4c3019820ceec612da15d5d5b0aa7b468
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

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

  Log Message:
  -----------
  ninja export to zip fix

  Commit: c18dfa35df30edde4b6704926809dd76c10e47bb
      https://github.com/Evolveum/midpoint/commit/c18dfa35df30edde4b6704926809dd76c10e47bb
  Author: matus <matus.macik at gmail.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusSetAssignmentsModal.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusTableWithChoosableElements.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Resource/ResourcesTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Popover.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismFormWithActionButtons.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/AbstractTableWithPrismView.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithComponentRedirect.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithRedirectElements.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourcesTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ListResourcesPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ProgressPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/TestBase.java
    R tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    R tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java
    A tools/schrodinger/src/test/resources/org-account-inducement.xml
    A tools/schrodinger/src/test/resources/user-raphael.xml

  Log Message:
  -----------
  ADD OrganizationStructureTests and UserPhotoTests test suites, some additional resource files, plumbing for the tests, classes and methods

  Commit: d2a138aff50c36f592c9dffc0e2003dd9c7e5e32
      https://github.com/Evolveum/midpoint/commit/d2a138aff50c36f592c9dffc0e2003dd9c7e5e32
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  minor postgres upgrade sql improvement

  Commit: 81b3b8f92cd4a99ab45ed5ea7684c1f37e850d01
      https://github.com/Evolveum/midpoint/commit/81b3b8f92cd4a99ab45ed5ea7684c1f37e850d01
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusSetAssignmentsModal.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusTableWithChoosableElements.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Resource/ResourcesTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Popover.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismFormWithActionButtons.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/AbstractTableWithPrismView.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithComponentRedirect.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithRedirectElements.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourcesTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ListResourcesPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ProgressPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/TestBase.java
    R tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    R tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java
    A tools/schrodinger/src/test/resources/org-account-inducement.xml
    A tools/schrodinger/src/test/resources/user-raphael.xml

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

  Commit: 2078a70135dc58c4bfd320a99350fa561516fa7f
      https://github.com/Evolveum/midpoint/commit/2078a70135dc58c4bfd320a99350fa561516fa7f
  Author: matus <matus.macik at gmail.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/PolyStringTests.java
    M tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java

  Log Message:
  -----------
  ADD PolyStringTests suite , FIX typo in Search component class

  Commit: 369072c2d3338c11362f98511d7c10f2146675b9
      https://github.com/Evolveum/midpoint/commit/369072c2d3338c11362f98511d7c10f2146675b9
  Author: matus <matus.macik at gmail.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java

  Log Message:
  -----------
  Fix Search, another typo after fixing the first one

  Commit: 7c5447b1616222dc08d6af7e8565c8c6cc348a35
      https://github.com/Evolveum/midpoint/commit/7c5447b1616222dc08d6af7e8565c8c6cc348a35
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

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

  Log Message:
  -----------
  MID-4644 Custom columns and lookup tables

  Commit: 49efa81beeb4a7295208171f85e9b5aabf18264b
      https://github.com/Evolveum/midpoint/commit/49efa81beeb4a7295208171f85e9b5aabf18264b
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusSetAssignmentsModal.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusTableWithChoosableElements.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Resource/ResourcesTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Popover.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismFormWithActionButtons.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/AbstractTableWithPrismView.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithComponentRedirect.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithRedirectElements.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourcesTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ListResourcesPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ProgressPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/TestBase.java
    R tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    R tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/PolyStringTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java
    A tools/schrodinger/src/test/resources/org-account-inducement.xml
    A tools/schrodinger/src/test/resources/user-raphael.xml

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

  Commit: ec5f3679d0992084b4b089da9c261fa4a53edbdc
      https://github.com/Evolveum/midpoint/commit/ec5f3679d0992084b4b089da9c261fa4a53edbdc
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

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

  Log Message:
  -----------
  MID-4675: adding subtype to search fields in GUI

  Commit: 28574df0c9a340e231b6be569b6f905aabda92f5
      https://github.com/Evolveum/midpoint/commit/28574df0c9a340e231b6be569b6f905aabda92f5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 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/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/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  another fix for MID-4640

  Commit: f9d1a8285791a6e9915cd6d376450ce6e989f69a
      https://github.com/Evolveum/midpoint/commit/f9d1a8285791a6e9915cd6d376450ce6e989f69a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java

  Log Message:
  -----------
  fixing MID-4639 Simple Object template causes projector to throw NPE

  Commit: 0a3c631c2d7f31cb399becf3649966a7cb5d751b
      https://github.com/Evolveum/midpoint/commit/0a3c631c2d7f31cb399becf3649966a7cb5d751b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java

  Log Message:
  -----------
  more logging for expression evaluation

  Commit: f0d81091b470ef522abb13f1d9c8bf70a68da39d
      https://github.com/Evolveum/midpoint/commit/f0d81091b470ef522abb13f1d9c8bf70a68da39d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 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/web/component/search/SearchFactory.java

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

  Commit: 24023a8dc53cb41705fad0bfa3fc47d3b5174e95
      https://github.com/Evolveum/midpoint/commit/24023a8dc53cb41705fad0bfa3fc47d3b5174e95
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  oracle upgrade script, not finished yet

  Commit: f3cb20954325363f63f758814ac805cf3a31cb11
      https://github.com/Evolveum/midpoint/commit/f3cb20954325363f63f758814ac805cf3a31cb11
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 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/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/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java

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

  Commit: ebf0a0259270be2dae072c7e65da7528c79e75be
      https://github.com/Evolveum/midpoint/commit/ebf0a0259270be2dae072c7e65da7528c79e75be
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  oracle upgrade script, some bugfixes

  Commit: c4d9d5c305ff917004bacaf20ad4b946be2fd85a
      https://github.com/Evolveum/midpoint/commit/c4d9d5c305ff917004bacaf20ad4b946be2fd85a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    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/activiti/ActivitiInterface.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/task.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.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/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Fix task result handling

The result was created on demand (as UNKNOWN) too eagerly: even
if it was not present just because it was not fetched. Now we create
it only on specific occasions - when transient task is created or
(with warning) when result-less task handler is to be executed.

Fixed some places that were expecting non-null result.
Also removed the coupling of result/resultStatus in repo.

  Commit: fcf2a29652beea5aba3e4882f6a7facd6185f21a
      https://github.com/Evolveum/midpoint/commit/fcf2a29652beea5aba3e4882f6a7facd6185f21a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    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/web/component/ObjectPolicyConfigurationEditor.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/configuration/component/AdminGuiConfigPanel.html
    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/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusSetAssignmentsModal.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusTableWithChoosableElements.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Resource/ResourcesTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Popover.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismFormWithActionButtons.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/AbstractTableWithPrismView.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithComponentRedirect.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithRedirectElements.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourcesTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ListResourcesPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ProgressPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/TestBase.java
    R tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    R tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/PolyStringTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java
    A tools/schrodinger/src/test/resources/org-account-inducement.xml
    A tools/schrodinger/src/test/resources/user-raphael.xml

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

  Commit: 104de6d27a4842ba484252d94803131cb7ad79a4
      https://github.com/Evolveum/midpoint/commit/104de6d27a4842ba484252d94803131cb7ad79a4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  sqlserver upgrade script, not finished yet

  Commit: 820cc0116c3592c0fe657f693bf54e2efc348127
      https://github.com/Evolveum/midpoint/commit/820cc0116c3592c0fe657f693bf54e2efc348127
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    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/activiti/ActivitiInterface.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/task.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.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/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

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

  Commit: 8845217c2c5a2fcf9df819f2090d3815f6314cc4
      https://github.com/Evolveum/midpoint/commit/8845217c2c5a2fcf9df819f2090d3815f6314cc4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  more fixes for sql server and oracle upgrade scripts

  Commit: 22939cea1fed9f40d1187fbdf1f5f6be97ba0c6e
      https://github.com/Evolveum/midpoint/commit/22939cea1fed9f40d1187fbdf1f5f6be97ba0c6e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java
    A samples/roles/approval-with-additional-information-expression.xml
    A samples/roles/approval-with-additional-information.xml

  Log Message:
  -----------
  Fix additionalInformation handling (MID-4017)

Approval stage additionalInformation has two forms: xsd:string
and c:InformationType. The latter allows for localizable strings;
however, it was broken. Also fix the support for multiple information
pieces.

  Commit: 15deaa5d91e0ba971e9c51dd21c9cfbc99f79502
      https://github.com/Evolveum/midpoint/commit/15deaa5d91e0ba971e9c51dd21c9cfbc99f79502
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql

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

  Commit: 31fbadfb030409a950d94345c6c5529c6aca31e1
      https://github.com/Evolveum/midpoint/commit/31fbadfb030409a950d94345c6c5529c6aca31e1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/resources/delivery/rules/k20.xml
    M testing/story/src/test/resources/delivery/rules/library.xml

  Log Message:
  -----------
  Fix TestDelivery (MID-4584)

The test configuration was broken.

  Commit: 98ba619e4575e4bceab2dadc55698f5fad8547a2
      https://github.com/Evolveum/midpoint/commit/98ba619e4575e4bceab2dadc55698f5fad8547a2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/user-phoenix.xml
    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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fixes and tests for manual connectors with repeated operations (MID-4587)

  Commit: 732b66752abd81594361a8e58004fac167d37bd4
      https://github.com/Evolveum/midpoint/commit/732b66752abd81594361a8e58004fac167d37bd4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/OrgStructGenerator.java

  Log Message:
  -----------
  orgs struct generator

  Commit: 69c03df10855778917883060aae8f65ac90a8056
      https://github.com/Evolveum/midpoint/commit/69c03df10855778917883060aae8f65ac90a8056
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/user-phoenix.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A samples/roles/approval-with-additional-information-expression.xml
    A samples/roles/approval-with-additional-information.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/resources/delivery/rules/k20.xml
    M testing/story/src/test/resources/delivery/rules/library.xml

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

  Commit: ff143ef5b86189d9496aa764334b329cb4b37e91
      https://github.com/Evolveum/midpoint/commit/ff143ef5b86189d9496aa764334b329cb4b37e91
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  more bugfixes to sql server script

  Commit: 28de16f2f22baf6ba504bf280e614e9e1daf6647
      https://github.com/Evolveum/midpoint/commit/28de16f2f22baf6ba504bf280e614e9e1daf6647
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java

  Log Message:
  -----------
  configuration bugfix for sql server, upgrade scripts improvements

  Commit: 47442f6c8e57a7cceb821265f848a702a87d1b98
      https://github.com/Evolveum/midpoint/commit/47442f6c8e57a7cceb821265f848a702a87d1b98
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

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

  Log Message:
  -----------
  Suppress "broken pipe" exceptions (MID-4559)

It is questionable whether we should explicitly log these ones anyway,
as are propagated upwards. Therefore lowering the priority to DEBUG.

  Commit: 31377ea6e79407b8aac2581ad30cf638269afe67
      https://github.com/Evolveum/midpoint/commit/31377ea6e79407b8aac2581ad30cf638269afe67
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/user-phoenix.xml
    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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/OrgStructGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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

  Commit: 0923c20c0b0ddeb3e6abbffc3359cb3fa1a70c63
      https://github.com/Evolveum/midpoint/commit/0923c20c0b0ddeb3e6abbffc3359cb3fa1a70c63
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

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

  Log Message:
  -----------
  MID-4677: fixed typo and grammar

  Commit: daf5a746775dfb181c192153682cfbb61981c31f
      https://github.com/Evolveum/midpoint/commit/daf5a746775dfb181c192153682cfbb61981c31f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/user-capsize.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  More tests for org manager authorizations (MID-3780)

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

  Changed paths:
    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/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java

  Log Message:
  -----------
  Fix ConstraintViolationException handling

This exception can be wrapped within PersistenceException. MidPoint
behavior was already fixed for addObject; now the fix is applied also
to modifyObject.

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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/user-capsize.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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

  Commit: 8345bddaf913bc30842b05b2548503dfac3c0160
      https://github.com/Evolveum/midpoint/commit/8345bddaf913bc30842b05b2548503dfac3c0160
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

  Log Message:
  -----------
  Switch isolation back to Serializable (MID-4679)

This is a temporary workaround for org closure corruption
in multithreaded scenarios.

  Commit: ee5c0492b5b18882aeef4d7354a218186140d98e
      https://github.com/Evolveum/midpoint/commit/ee5c0492b5b18882aeef4d7354a218186140d98e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Undeprecation (MID-4680)

  Commit: ec4d1039aecd56fa24fe3c5d037605d213ebd5be
      https://github.com/Evolveum/midpoint/commit/ec4d1039aecd56fa24fe3c5d037605d213ebd5be
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Attempt to reproduce MID-4631

  Commit: 0af23be94f98b621d50826352233269d9eb86357
      https://github.com/Evolveum/midpoint/commit/0af23be94f98b621d50826352233269d9eb86357
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  oracle upgrade script fix

  Commit: 53881e72ed8fb26769c9a5dd509d60aecfd4670f
      https://github.com/Evolveum/midpoint/commit/53881e72ed8fb26769c9a5dd509d60aecfd4670f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.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/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/user-capsize.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.java

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

  Commit: 222c72fdb221857b8df84faa90bfaef6ed531bd6
      https://github.com/Evolveum/midpoint/commit/222c72fdb221857b8df84faa90bfaef6ed531bd6
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupableObjectListPanel.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/form/multivalue/GenericMultiValueLabelEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java

  Log Message:
  -----------
  tomcat crash fix for induced entitlements panel

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

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    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/search/SearchFactory.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/dto/ObjectPolicyDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.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/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/manual/user-phoenix.xml
    A model/model-intest/src/test/resources/security/user-capsize.xml
    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/activiti/ActivitiInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/OrgStructGenerator.java
    M repo/repo-sql-impl-test/src/test/resources/basic/task.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.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/helpers/OrgClosureManager.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.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/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java
    A samples/roles/approval-with-additional-information-expression.xml
    A samples/roles/approval-with-additional-information.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/resources/delivery/rules/k20.xml
    M testing/story/src/test/resources/delivery/rules/library.xml

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

  Commit: 5d1de26b561f4613b3962d1a355fbc17d89ebe3b
      https://github.com/Evolveum/midpoint/commit/5d1de26b561f4613b3962d1a355fbc17d89ebe3b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  Disable failing test related to MID-4681

There's a problem with reclaiming mis-delegated work buckets.

  Commit: 0687882cb673ea8637fcac426abeedc01120242f
      https://github.com/Evolveum/midpoint/commit/0687882cb673ea8637fcac426abeedc01120242f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupableObjectListPanel.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/form/multivalue/GenericMultiValueLabelEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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

  Commit: 27d60b83a5104aaeec1b94c398b5d378fdf676ac
      https://github.com/Evolveum/midpoint/commit/27d60b83a5104aaeec1b94c398b5d378fdf676ac
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    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/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  sql server upgrade script probably finished.

  Commit: 9942ebb21880c074f823011ec8e27df3575c3163
      https://github.com/Evolveum/midpoint/commit/9942ebb21880c074f823011ec8e27df3575c3163
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportConsumerWorker.java

  Log Message:
  -----------
  encryption fix in ninja

  Commit: f8467bb9a521bc4a6659bcc5e859515808149394
      https://github.com/Evolveum/midpoint/commit/f8467bb9a521bc4a6659bcc5e859515808149394
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  induced entitlements style fix

  Commit: 5716a3469dbaeea66293c495de11a42fd56b17d0
      https://github.com/Evolveum/midpoint/commit/5716a3469dbaeea66293c495de11a42fd56b17d0
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    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/SqlRepositoryConfiguration.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/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportConsumerWorker.java

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

  Commit: ded7f1dfa17485524510cbb5995346f407c10967
      https://github.com/Evolveum/midpoint/commit/ded7f1dfa17485524510cbb5995346f407c10967
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationQueryable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsm.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorConfiguration.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorInstance.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicket.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicketStatus.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-dummy-itsm.xml
    M model/model-intest/testng-integration.xml
    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/ProvisioningServiceImpl.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Improvements/fixes to manual connectors and consistency (MID-4569)

  Commit: 131c8fb16d05911bde51be4776ecd16c36bdd32e
      https://github.com/Evolveum/midpoint/commit/131c8fb16d05911bde51be4776ecd16c36bdd32e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Add (disabled) tests for various issues

Namely:
- MID-4593: First password change sets no metadata
- MID-4688: Non-literal prism diff honoring metadata is broken
- MID-4689: Specify ObjectDelta.findItemDelta semantics
- MID-4690: ObjectDelta.merge fails on some occasions

  Commit: 892aa6f12b815295169badf576c882548bc3f0af
      https://github.com/Evolveum/midpoint/commit/892aa6f12b815295169badf576c882548bc3f0af
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationQueryable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsm.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorConfiguration.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorInstance.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicket.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicketStatus.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-dummy-itsm.xml
    M model/model-intest/testng-integration.xml
    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/ProvisioningServiceImpl.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.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/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportConsumerWorker.java

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

  Commit: a4ee8b6b04a79679c14cc20abe72af2bd168efa7
      https://github.com/Evolveum/midpoint/commit/a4ee8b6b04a79679c14cc20abe72af2bd168efa7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java

  Log Message:
  -----------
  Preliminarily fix delta merging (MID-4690)

It looks like the special sub-delta handling code introduced into
ItemDelta.findItemDelta causes problems during object delta merging -
when specific combinations of overlapping modifications are merged.

This partly fixes MID-4593 "First password change sets no metadata".

(This commit is an attempt to fix that; not much tested yet.)

  Commit: 25f55a07b78f9656ad06c55d1d93c22aa7ad1c40
      https://github.com/Evolveum/midpoint/commit/25f55a07b78f9656ad06c55d1d93c22aa7ad1c40
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  MID-4491: omit dash with empty string if the relation is default

  Commit: d9f82847e892de3064da2c16239a5647b2f3ca38
      https://github.com/Evolveum/midpoint/commit/d9f82847e892de3064da2c16239a5647b2f3ca38
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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

  Commit: af4a9dd7bb444f736a3cdd9c4ba09416a83a2ad0
      https://github.com/Evolveum/midpoint/commit/af4a9dd7bb444f736a3cdd9c4ba09416a83a2ad0
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java

  Log Message:
  -----------
  icon column for shadow type width fix

  Commit: 72a61fd2a708d0c05a08922b640bb64123c430f6
      https://github.com/Evolveum/midpoint/commit/72a61fd2a708d0c05a08922b640bb64123c430f6
  Author: kate <honchar at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationQueryable.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsm.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorConfiguration.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorInstance.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicket.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicketStatus.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-dummy-itsm.xml
    M model/model-intest/testng-integration.xml
    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/ProvisioningServiceImpl.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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

  Commit: 6863b7f8833ae993e7ebfdcbf0681fa123a46f81
      https://github.com/Evolveum/midpoint/commit/6863b7f8833ae993e7ebfdcbf0681fa123a46f81
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java

  Log Message:
  -----------
  Fix hashing first password (MID-4593)

  Commit: 4ccaa52f6caf6a88709d8591166eb189b28a98fb
      https://github.com/Evolveum/midpoint/commit/4ccaa52f6caf6a88709d8591166eb189b28a98fb
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M dist/pom.xml
    M dist/src/main/assembly/dist.xml
    A dist/src/main/bin/ninja37.sh
    A dist/src/main/bin/upgrade.sh

  Log Message:
  -----------
  ninja and ninja37 packaged to dist, simple upgrade script

  Commit: c3123f32daf93e562798d16f87862814598fa86a
      https://github.com/Evolveum/midpoint/commit/c3123f32daf93e562798d16f87862814598fa86a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java

  Log Message:
  -----------
  Merge branch 'fix/mid-4690'

  Commit: 43f12d9d945e4a576c69873b164de30db65057ea
      https://github.com/Evolveum/midpoint/commit/43f12d9d945e4a576c69873b164de30db65057ea
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M dist/src/main/bin/ninja37.sh

  Log Message:
  -----------
  ninja37 typo fix

  Commit: 88ba704fc02a03d5565e73556da8cfd73e092ad0
      https://github.com/Evolveum/midpoint/commit/88ba704fc02a03d5565e73556da8cfd73e092ad0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java

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

  Commit: 635fffeb3a2223ec0ca2a39439bee8689f7388d0
      https://github.com/Evolveum/midpoint/commit/635fffeb3a2223ec0ca2a39439bee8689f7388d0
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M build-system/pom.xml
    A config/sql/_all/mysql-upgrade-3.7-3.8-utf8mb4.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    M dist/pom.xml
    M dist/src/main/assembly/dist.xml
    A dist/src/main/bin/ninja37.sh
    A dist/src/main/bin/upgrade.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupableObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.html
    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/assignment/AssignmentsUtil.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/column/ColumnUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.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/objectdetails/FocusMainPanel.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/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/AdminGuiConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/NotificationConfigPanel.html
    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/PageDebugDownloadBehaviour.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/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationQueryable.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestExport.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/MidPointLdapAuthenticationProvider.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.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/ReconciliationTaskHandler.java
    M model/model-intest/pom.xml
    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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/CsvBackingStore.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsm.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorConfiguration.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmIntegrationConnectorInstance.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicket.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/DummyItsmTicketStatus.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.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/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-dummy-itsm.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-slow-proposed.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    A model/model-intest/src/test/resources/manual/user-phantom.xml
    A model/model-intest/src/test/resources/manual/user-phoenix.xml
    A model/model-intest/src/test/resources/security/user-capsize.xml
    M model/model-intest/testng-integration.xml
    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/activiti/ActivitiInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfStageComputeHelper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCaretaker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.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/AuditTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/OrgStructGenerator.java
    M repo/repo-sql-impl-test/src/test/resources/basic/task.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.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/SqlRepositoryConfiguration.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/audit/RObjectDeltaOperation.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/RAExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.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/any/ROExtBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.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/ObjectDeltaUpdater.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/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.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/execution/JobExecutor.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/work/WorkStateManager.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestWorkDistribution.java
    A samples/roles/approval-with-additional-information-expression.xml
    A samples/roles/approval-with-additional-information.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/logback-test.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
    M testing/story/src/test/resources/delivery/rules/k20.xml
    M testing/story/src/test/resources/delivery/rules/library.xml
    A testing/story/src/test/resources/mapleLeaf/object-template-user.xml
    M testing/story/src/test/resources/mapleLeaf/resource-opendj.xml
    A testing/story/src/test/resources/schema/mapleLeaf.xsd
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportConsumerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/BaseImportExportOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/CountOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ExportOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusSetAssignmentsModal.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/FocusTableWithChoosableElements.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Resource/ResourcesTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Popover.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismFormWithActionButtons.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/AbstractTableWithPrismView.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithComponentRedirect.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithRedirectElements.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourcesTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTablePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ListResourcesPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ListUsersPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/ProgressPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Schrodinger.java
    M tools/schrodinger/src/test/java/schrodinger/TestBase.java
    R tools/schrodinger/src/test/java/schrodinger/core/AccountTests.java
    R tools/schrodinger/src/test/java/schrodinger/core/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/AccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/OrganizationStructureTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/PolyStringTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserAccountTests.java
    A tools/schrodinger/src/test/java/schrodinger/scenarios/UserPhotoTests.java
    A tools/schrodinger/src/test/resources/org-account-inducement.xml
    A tools/schrodinger/src/test/resources/user-raphael.xml

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

  Commit: edf4179b375e3ba8400b671a1d122f57ee65bf57
      https://github.com/Evolveum/midpoint/commit/edf4179b375e3ba8400b671a1d122f57ee65bf57
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-05-29 (Tue, 29 May 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, WIP

Compare: https://github.com/Evolveum/midpoint/compare/09f7d53a8111...edf4179b375e
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.