[midPoint-git] [Evolveum/midpoint] 7475e6: Create test for diffing with equal values

[Misagh Moayyed]

  Branch: refs/heads/unused-imports
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7475e6daa94b3464b87746752e118e1feefc7579
      https://github.com/Evolveum/midpoint/commit/7475e6daa94b3464b87746752e118e1feefc7579
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-31 (Wed, 31 Jan 2018)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml

  Log Message:
  -----------
  Create test for diffing with equal values


  Commit: 22448879df9fc19cdb56bd0b30c3006dc9e28b65
      https://github.com/Evolveum/midpoint/commit/22448879df9fc19cdb56bd0b30c3006dc9e28b65
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

  Log Message:
  -----------
  test fix attempt


  Commit: c2200cd7fdb93f6d3f7624020f534b0a509ed688
      https://github.com/Evolveum/midpoint/commit/c2200cd7fdb93f6d3f7624020f534b0a509ed688
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes


  Commit: a13d30d479477687a88d67e2ca74ebd8adede817
      https://github.com/Evolveum/midpoint/commit/a13d30d479477687a88d67e2ca74ebd8adede817
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

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

  Log Message:
  -----------
  test fix second attempt


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.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
    A model/model-intest/src/test/resources/common/role-useless.xml
    A model/model-intest/src/test/resources/object-template/user-template-useless.xml

  Log Message:
  -----------
  Fix MID-4426: originMappingName not always set

Metadata update was missing for quick reconciliation that was
employed for zero-set values (for strong, weak and sourceless
normal mappings). And for non-tolerant mappings as well.


  Commit: bef067fb6d2983fb5073c8c9f2f312de3240afed
      https://github.com/Evolveum/midpoint/commit/bef067fb6d2983fb5073c8c9f2f312de3240afed
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

  Changed paths:
    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/OperationResultFull.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  Ensure audit logs are compressed


  Commit: 003857171b499178f2c86eb816a0a42b5d1a3e3e
      https://github.com/Evolveum/midpoint/commit/003857171b499178f2c86eb816a0a42b5d1a3e3e
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/MidPointApplicationConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/testng-integration.xml
    M gui/admin-gui/testng-unit.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.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/prism/xml/ns/_public/types_3/ItemDeltaType.java
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/task-modelOperationContext-before.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.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/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/DBValidator.java
    A repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/QueryCountInterceptor.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java
    A repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestInterceptor.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryBeanPostProcessor.java
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-test.xml
    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/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/CleanupTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/LookupTableTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyAssignmentTest.java
    A 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/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/resources/logback-test.xml
    A repo/repo-sql-impl-test/src/test/resources/update/user.xml
    M repo/repo-sql-impl/pom.xml
    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/RAuditItem.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditPropertyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditReferenceValue.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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTextInfo.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.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/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/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/any/RValueType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/DefaultModifyHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/MetadataHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ModifyHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ShadowHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/ShadowLinkRefHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/SyncSituationHandler.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/handler/TaskProgressHandler.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/GeneralHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/LookupTableHelper.java
    A 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
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/ActivationMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/AssignmentMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/AutoassignSpecificationMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/ContainerMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/EmbeddedObjectReferenceMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/EnumMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/Mapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/MetadataMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/ObjectReferenceMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/OperationExecutionMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/OperationResultMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/OperationalStateMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/PolyStringMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/QNameMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/TriggerMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/EntityRegistry.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/Ignore.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/MapperContext.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/PrismEntityMapper.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/PrismEntityPair.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryImpl.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/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointPhysicalNamingStrategy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/LoggedUser.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Paging.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/PrismForm.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Search.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/TabPanel.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/Table.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserAssignmentsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserBasicTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserDelegatedToMeTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserDelegationsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserHistoryTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserPersonasTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserProjectionsTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UserTasksTab.java
    R tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/UsersTable.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Paging.java
    A 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/Search.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Table.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/configuration/SystemTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserAssignmentsTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserBasicTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserDelegatedToMeTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserDelegationsTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserHistoryTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserPersonasTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserProjectionsTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UserTasksTab.java
    A tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/LoginPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/configuration/ImportObjectPage.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/NewUserPage.java
    M tools/schrodinger/src/test/java/schrodinger/UsersTest.java

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

# Conflicts:
#	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
#	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
#	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java


  Commit: 8257e6f55393ff5e16ef6b32998f6eb86d35514d
      https://github.com/Evolveum/midpoint/commit/8257e6f55393ff5e16ef6b32998f6eb86d35514d
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

  Changed paths:
    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:
  -----------
  ensure fields are actually compressed


  Commit: c950d9b55c6faa9360e894de5a16724d72060377
      https://github.com/Evolveum/midpoint/commit/c950d9b55c6faa9360e894de5a16724d72060377
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

  Changed paths:
    A config/sql/midpoint/3.7/h2/h2-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/mysql/mysql-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  working on upgrade scripts


  Commit: f9f25d6349aecd417b958f95d25bd8f29d83330f
      https://github.com/Evolveum/midpoint/commit/f9f25d6349aecd417b958f95d25bd8f29d83330f
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

  Changed paths:
    A config/sql/midpoint/3.7/oracle/oracle-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.7-3.8.sql

  Log Message:
  -----------
  working on upgrade scripts


  Commit: 7ec5035856e6c8ea639f78c525298a051ac8e798
      https://github.com/Evolveum/midpoint/commit/7ec5035856e6c8ea639f78c525298a051ac8e798
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M config/sql/_all/h2-upgrade-3.7-3.8.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 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  removed rexclusion table, upgrade scripts fixed


  Commit: 9c0ec7be19046a65263173ca8f7186f469157208
      https://github.com/Evolveum/midpoint/commit/9c0ec7be19046a65263173ca8f7186f469157208
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    R config/sql/_all/h2-3.7-all.sql
    A config/sql/_all/h2-3.8-all.sql
    R config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql
    R config/sql/_all/h2-upgrade-3.6-3.7.sql
    R config/sql/_all/mysql-3.7-all.sql
    A config/sql/_all/mysql-3.8-all.sql
    R config/sql/_all/mysql-upgrade-3.6-3.7.sql
    R config/sql/_all/oracle-3.7-all.sql
    A config/sql/_all/oracle-3.8-all.sql
    R config/sql/_all/oracle-upgrade-3.6-3.7.sql
    R config/sql/_all/postgresql-3.7-all.sql
    A config/sql/_all/postgresql-3.8-all.sql
    R config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    R config/sql/_all/sqlserver-3.7-all.sql
    A config/sql/_all/sqlserver-3.8-all.sql
    R config/sql/_all/sqlserver-upgrade-3.6-3.7.sql

  Log Message:
  -----------
  all scripts updated (removed exclusion table), removed/renamed old scripts


  Commit: 04b0417a5991a7ea16ed1bcde764d126ef45c3b5
      https://github.com/Evolveum/midpoint/commit/04b0417a5991a7ea16ed1bcde764d126ef45c3b5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

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

  Log Message:
  -----------
  schrodinger serialization issue fixed


  Commit: 29284662124505b058d7813ecd1bf0b0bf11478c
      https://github.com/Evolveum/midpoint/commit/29284662124505b058d7813ecd1bf0b0bf11478c
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/testng-unit.xml

  Log Message:
  -----------
  test fix + enabled admin gui (wrapper creation) test


  Commit: e603a865d7f9f8278ce619a130f6182098313989
      https://github.com/Evolveum/midpoint/commit/e603a865d7f9f8278ce619a130f6182098313989
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java

  Log Message:
  -----------
  minor profiling improvements


  Commit: 4cc7ce118ea1a4a87c7d6ebb351e9f01180c9677
      https://github.com/Evolveum/midpoint/commit/4cc7ce118ea1a4a87c7d6ebb351e9f01180c9677
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/testng-unit.xml

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


  Commit: 03c69d4efa633acda8ad8daf7b2f2fd91b85690d
      https://github.com/Evolveum/midpoint/commit/03c69d4efa633acda8ad8daf7b2f2fd91b85690d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml

  Log Message:
  -----------
  Function: midpoint.isEvaluateNew()


  Commit: 67bcda4d67dd5199fdffb7d5ef187cefb25a232d
      https://github.com/Evolveum/midpoint/commit/67bcda4d67dd5199fdffb7d5ef187cefb25a232d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.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/mapping/TestMapping.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    A model/model-intest/src/test/resources/common/role-useless.xml
    A model/model-intest/src/test/resources/object-template/user-template-useless.xml

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes'


  Commit: 73fbf5b1a2b9e02882a98da79178cd104cb5798b
      https://github.com/Evolveum/midpoint/commit/73fbf5b1a2b9e02882a98da79178cd104cb5798b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M gui/admin-gui/testng-integration.xml

  Log Message:
  -----------
  uncommented gui object wrapper test


  Commit: 6e52e3c5130065e4e478d57aedb2b9e52f923ba2
      https://github.com/Evolveum/midpoint/commit/6e52e3c5130065e4e478d57aedb2b9e52f923ba2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.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/mapping/TestMapping.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    A model/model-intest/src/test/resources/common/role-useless.xml
    A model/model-intest/src/test/resources/object-template/user-template-useless.xml

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


  Commit: 00840185b76f8e53a788e7568e7e8e04c7d18b81
      https://github.com/Evolveum/midpoint/commit/00840185b76f8e53a788e7568e7e8e04c7d18b81
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

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

  Log Message:
  -----------
  selected all fix


  Commit: 353efd35bd95ed44a195eeedd9d3b37650c3f3d9
      https://github.com/Evolveum/midpoint/commit/353efd35bd95ed44a195eeedd9d3b37650c3f3d9
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes


  Commit: 974f3f55abdd1d69b26bcfc201f020269bf38a15
      https://github.com/Evolveum/midpoint/commit/974f3f55abdd1d69b26bcfc201f020269bf38a15
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTestSimple.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/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
    A repo/repo-sql-impl-test/src/test/resources/basic/user0.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/account-attribute.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/user-with-assignment-extension.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl-test/testng-integration.xml
    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/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    A 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/RAExtValue.java
    A 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
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RItemKind.java
    A 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/any/ROExtValue.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RValueType.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtBaseId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtBooleanId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtBaseId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtBooleanId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.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/query2/resolution/ItemPathResolver.java

  Log Message:
  -----------
  Normalize definitions in extension tables

Here we remove redundant item definition data (name, type, etc)
from m_object_ext_XXX and m_assignment_ext_XXX tables.

Currently repo tests pass, but provisioning ones do not.

Also, there are some unfinished/temporary parts, like storing session
into threadlocal variable; we also need to decide whether to implement
equals/hashcode for ROExt* and RAExt* classes, etc.


  Commit: 817d40963a2ae6c51e51c30d701007accaf1af53
      https://github.com/Evolveum/midpoint/commit/817d40963a2ae6c51e51c30d701007accaf1af53
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    A repo/repo-sql-impl-test/src/test/resources/modify/account-delta.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBase.java

  Log Message:
  -----------
  fixed code, test should now pass


  Commit: 0458cd5849c9215dabfc3c5e849705105ecc8fdc
      https://github.com/Evolveum/midpoint/commit/0458cd5849c9215dabfc3c5e849705105ecc8fdc
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M gui/admin-gui/testng-integration.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/extension-normalization


  Commit: e335ae0508781ebe66ef23d09987c665095e7329
      https://github.com/Evolveum/midpoint/commit/e335ae0508781ebe66ef23d09987c665095e7329
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  assign via org tree panel


  Commit: 2934de79500296a21c559802377cdf03384b9647
      https://github.com/Evolveum/midpoint/commit/2934de79500296a21c559802377cdf03384b9647
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    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/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

  Log Message:
  -----------
  fixed equals


  Commit: 0b7ee8670c0e264a0a84b19ae542db86f4ad45c7
      https://github.com/Evolveum/midpoint/commit/0b7ee8670c0e264a0a84b19ae542db86f4ad45c7
  Author: Viliam Repan <1azyman at users.noreply.github.com>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    A config/sql/midpoint/3.7/h2/h2-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/mysql/mysql-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/oracle/oracle-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.7-3.8.sql
    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/OperationResultFull.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  Merge pull request #62 from Evolveum/audit-compression

WIP - Ensure audit logs compress deltas and results to save space


  Commit: 4392d6095dd9877c71370252cc98d5d6c08f2c32
      https://github.com/Evolveum/midpoint/commit/4392d6095dd9877c71370252cc98d5d6c08f2c32
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    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:
  -----------
  minor audit improvements


  Commit: e6922e4538d13e479e6603eadb41cd7058449487
      https://github.com/Evolveum/midpoint/commit/e6922e4538d13e479e6603eadb41cd7058449487
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java

  Log Message:
  -----------
  updated scripts, removed sequence generator


  Commit: 33d59933879c8c75939c7d74114e63df422472a1
      https://github.com/Evolveum/midpoint/commit/33d59933879c8c75939c7d74114e63df422472a1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

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

  Log Message:
  -----------
  Fix MID-4412: Audit cleanup performance (MySQL)

As proposed by Petr, we have changed subquery-based delete to
inner join-based one.

TODO: consider such a change also for other databases


  Commit: 3892324bda4569376f4dff09a205cc9694bdc4db
      https://github.com/Evolveum/midpoint/commit/3892324bda4569376f4dff09a205cc9694bdc4db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractAjaxDownloadBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/Action.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java

  Log Message:
  -----------
  Fix MID-4406: Lookup table export

Added lookup table rows, certification campaign cases, and user photos
to exports via repository objects page and ninja tool. In the future
we should make this configurable; currently these items are always
exported (in the same way as they are always shown on repository
objects 'view' page).


  Commit: 315f4d66c69e16b462678c264ddf23f65ab3c83c
      https://github.com/Evolveum/midpoint/commit/315f4d66c69e16b462678c264ddf23f65ab3c83c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.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/TestSemiManualGrouping.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.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/ShadowManager.java

  Log Message:
  -----------
  Fixing manual connectors: proposed shadow + matching rule (MID-4393)


  Commit: 4ec89ca4a5a93016dd324eb1b5e5e598791d7d9c
      https://github.com/Evolveum/midpoint/commit/4ec89ca4a5a93016dd324eb1b5e5e598791d7d9c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractAjaxDownloadBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.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/TestSemiManualGrouping.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.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/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/Action.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes'


  Commit: ff87207d92fa28328a3ecf40e9590e6760d9903a
      https://github.com/Evolveum/midpoint/commit/ff87207d92fa28328a3ecf40e9590e6760d9903a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  removed obsolete properties files


  Commit: c4179e2cfd41595394b256cf3151c4283fe8a77a
      https://github.com/Evolveum/midpoint/commit/c4179e2cfd41595394b256cf3151c4283fe8a77a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractAjaxDownloadBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.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/TestSemiManualGrouping.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping-proposed.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/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/Action.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java

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


  Commit: 15f3647d601f636526ba1017d393313125ba8d5f
      https://github.com/Evolveum/midpoint/commit/15f3647d601f636526ba1017d393313125ba8d5f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

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

  Log Message:
  -----------
  compile time fix


  Commit: d6a17195622e970245d1c7674a8ac8f0560a5a5c
      https://github.com/Evolveum/midpoint/commit/d6a17195622e970245d1c7674a8ac8f0560a5a5c
  Author: Kristian <ksuchanovsky at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    A dist/src/main/bin/export.bat
    A dist/src/main/bin/export.sh
    A dist/src/main/bin/import.bat
    A dist/src/main/bin/import.sh
    A dist/src/main/bin/keys.bat
    A dist/src/main/bin/keys.sh

  Log Message:
  -----------
  New linux and windows scripts for ninja.jar


  Commit: ff821671493313418ecf55219f0c8b2dd5c1bb63
      https://github.com/Evolveum/midpoint/commit/ff821671493313418ecf55219f0c8b2dd5c1bb63
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

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

  Log Message:
  -----------
  Fixing wrong evaluation of #unassign when adding roles (MID-4443)


  Commit: 88efae43286a19afd3b1f66aab9d1e37f3075d1b
      https://github.com/Evolveum/midpoint/commit/88efae43286a19afd3b1f66aab9d1e37f3075d1b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixing authorizations of empty objects (MID-4369)


  Commit: 6a12e679a2f53b87316d0c0c21837334169f4a2e
      https://github.com/Evolveum/midpoint/commit/6a12e679a2f53b87316d0c0c21837334169f4a2e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.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 repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes'


  Commit: d9fd6243986dda951995633451bd8676f4e09b9c
      https://github.com/Evolveum/midpoint/commit/d9fd6243986dda951995633451bd8676f4e09b9c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-intest/pom.xml

  Log Message:
  -----------
  post-merge fix


  Commit: 5e62cf2b9abd7e3aef3b15dc8f5af5c34de884f7
      https://github.com/Evolveum/midpoint/commit/5e62cf2b9abd7e3aef3b15dc8f5af5c34de884f7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-intest/pom.xml

  Log Message:
  -----------
  Dependency fix


  Commit: dcd1f0c797131e82d1c669a7297cacd16ae63695
      https://github.com/Evolveum/midpoint/commit/dcd1f0c797131e82d1c669a7297cacd16ae63695
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-intest/pom.xml

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes'


  Commit: e6b92f050e8873b8b50ab5e140948532bd95f804
      https://github.com/Evolveum/midpoint/commit/e6b92f050e8873b8b50ab5e140948532bd95f804
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M model/model-intest/pom.xml

  Log Message:
  -----------
  dependency fix


  Commit: a2737b30e6507d871beb2ab020283b17c79c674b
      https://github.com/Evolveum/midpoint/commit/a2737b30e6507d871beb2ab020283b17c79c674b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 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/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-multi.xml
    R model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/schema/resource.xsd
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationTaskHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java

  Log Message:
  -----------
  Multi-resource propagation task (MID-4440)


  Commit: 566243f536a66acf0be12b0aa7a9cdfbbcf9ff0e
      https://github.com/Evolveum/midpoint/commit/566243f536a66acf0be12b0aa7a9cdfbbcf9ff0e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 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/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-multi.xml
    R model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/schema/resource.xsd
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationTaskHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes'


  Commit: 5022507e15f6086c30148b9559c7b205c8b73f33
      https://github.com/Evolveum/midpoint/commit/5022507e15f6086c30148b9559c7b205c8b73f33
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.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/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

  Log Message:
  -----------
  fixed extension indexes


  Commit: 3f10d3ce974b4ed7cd449572522796ecc2110994
      https://github.com/Evolveum/midpoint/commit/3f10d3ce974b4ed7cd449572522796ecc2110994
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-02-12 (Mon, 12 Feb 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/TestSemiManualGrouping.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-multi.xml
    R model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/schema/resource.xsd
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationTaskHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java

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


  Commit: e7ca6d6f303f984f89f1dc840bbf4544fb0dc150
      https://github.com/Evolveum/midpoint/commit/e7ca6d6f303f984f89f1dc840bbf4544fb0dc150
  Author: matus <matus.macik at gmail.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

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

  Log Message:
  -----------
  MID-3490, Fix - Select modified server after creation/update


  Commit: e949629782e03a32dc5d6c56832cea9e5ef57c83
      https://github.com/Evolveum/midpoint/commit/e949629782e03a32dc5d6c56832cea9e5ef57c83
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    R config/sql/_all/h2-3.7-all.sql
    A config/sql/_all/h2-3.8-all.sql
    R config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql
    R config/sql/_all/h2-upgrade-3.6-3.7.sql
    M config/sql/_all/h2-upgrade-3.7-3.8.sql
    R config/sql/_all/mysql-3.7-all.sql
    A config/sql/_all/mysql-3.8-all.sql
    R config/sql/_all/mysql-upgrade-3.6-3.7.sql
    M config/sql/_all/mysql-upgrade-3.7-3.8.sql
    R config/sql/_all/oracle-3.7-all.sql
    A config/sql/_all/oracle-3.8-all.sql
    R config/sql/_all/oracle-upgrade-3.6-3.7.sql
    M config/sql/_all/oracle-upgrade-3.7-3.8.sql
    R config/sql/_all/postgresql-3.7-all.sql
    A config/sql/_all/postgresql-3.8-all.sql
    R config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    M config/sql/_all/postgresql-upgrade-3.7-3.8.sql
    R config/sql/_all/sqlserver-3.7-all.sql
    A config/sql/_all/sqlserver-3.8-all.sql
    R config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
    M config/sql/_all/sqlserver-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/h2/h2-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/mysql/mysql-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/oracle/oracle-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.7-3.8.sql
    A config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.7-3.8.sql
    A dist/src/main/bin/export.bat
    A dist/src/main/bin/export.sh
    A dist/src/main/bin/import.bat
    A dist/src/main/bin/import.sh
    A dist/src/main/bin/keys.bat
    A dist/src/main/bin/keys.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/NotificationConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M gui/admin-gui/testng-integration.xml
    M gui/admin-gui/testng-unit.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.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/TestSemiManualGrouping.java
    A 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/mapping/TestMapping.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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    A model/model-intest/src/test/resources/common/role-useless.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A 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
    A model/model-intest/src/test/resources/manual/task-propagation-multi.xml
    R model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/object-template/user-template-useless.xml
    A model/model-intest/src/test/resources/schema/resource.xsd
    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/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/ShadowManager.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationTaskHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTestSimple.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-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
    A repo/repo-sql-impl-test/src/test/resources/basic/user0.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/account-attribute.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/account-delta.xml
    A repo/repo-sql-impl-test/src/test/resources/modify/user-with-assignment-extension.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl-test/testng-integration.xml
    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/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/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/OperationResultFull.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    A 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/RAExtValue.java
    A 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
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RItemKind.java
    A 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/any/ROExtValue.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RValueType.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtBaseId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtBooleanId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtBaseId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtBooleanId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.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/query2/resolution/ItemPathResolver.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/Action.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ExportRepositoryAction.java

  Log Message:
  -----------
  Merge branch 'master' into unused-imports

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java


  Commit: fd030a643287d3110ddd9b6502286fefcab07c90
      https://github.com/Evolveum/midpoint/commit/fd030a643287d3110ddd9b6502286fefcab07c90
  Author: Misagh Moayyed <mmoayyed at unicon.net>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.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/TestSemiManualGroupingProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/MultiPropagationTaskHandler.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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  clean up Cntd


Compare: https://github.com/Evolveum/midpoint/compare/6631bc241c14...fd030a643287