[midPoint-git] [Evolveum/midpoint] 6bc3c7: audit implementation optimization, db script yet t...

Petr Gašparík petr at gasparik.cz
Mon Jan 15 16:39:48 CET 2018


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6bc3c70765a9c014eac76c8dbf1f084d86d32d6c
      https://github.com/Evolveum/midpoint/commit/6bc3c70765a9c014eac76c8dbf1f084d86d32d6c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    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/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/util/EntityState.java

  Log Message:
  -----------
  audit implementation optimization, db script yet to be updated


  Commit: 512585c3944fbccd6ef4b3b0721df5db695e5872
      https://github.com/Evolveum/midpoint/commit/512585c3944fbccd6ef4b3b0721df5db695e5872
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    A dist/src/main/bin/springboot.sh
    M dist/src/main/bin/start.sh
    M dist/src/main/bin/stop.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M testing/conntest/pom.xml
    M testing/conntest/src/test/resources/ctx-conntest-test-main.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/db-optimization


  Commit: aeba29499993374ac546f0b64d1231a2cc3551c5
      https://github.com/Evolveum/midpoint/commit/aeba29499993374ac546f0b64d1231a2cc3551c5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

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

  Log Message:
  -----------
  identity column reverted back to sequence for now


  Commit: 68649fcb2f44a5e172863cdaf34327d2bcfc4c4b
      https://github.com/Evolveum/midpoint/commit/68649fcb2f44a5e172863cdaf34327d2bcfc4c4b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    M build-system/pom.xml
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-test.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    M repo/repo-sql-impl/pom.xml
    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/helpers/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/PrefixedStringType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/XMLGregorianCalendarType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/CertWorkItemIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointJoinedPersister.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointMySQLDialect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointPostgreSQLDialect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointSingleTablePersister.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ObjectOidGenerator.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  upgrade to hibernate5, not compilable


  Commit: ab84f43147dc0cc95b853561e027e0302baea40f
      https://github.com/Evolveum/midpoint/commit/ab84f43147dc0cc95b853561e027e0302baea40f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    A 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/SpringApplicationContextTest.java

  Log Message:
  -----------
  refactored schema generation test, failing


  Commit: 2be472776fb45ee347e6a78fb8f15682fd433159
      https://github.com/Evolveum/midpoint/commit/2be472776fb45ee347e6a78fb8f15682fd433159
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-test.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointImplicitNamingStrategy.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointPhysicalNamingStrategy.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  nothing is working, we like it like that


  Commit: d94a04b35ac170c556229761ce9ccb81c0944979
      https://github.com/Evolveum/midpoint/commit/d94a04b35ac170c556229761ce9ccb81c0944979
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    M build-system/pom.xml
    M dist/src/main/bin/springboot.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml

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


  Commit: b0705773a154bbfe49fdadff852b5a76e942205c
      https://github.com/Evolveum/midpoint/commit/b0705773a154bbfe49fdadff852b5a76e942205c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java

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


  Commit: 5d81c760398d54b7b7dcd34580e68d5eab1ddd11
      https://github.com/Evolveum/midpoint/commit/5d81c760398d54b7b7dcd34580e68d5eab1ddd11
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  schema generation now finishes, still produces garbage


  Commit: 0c188e77de45b7f291e80c20f21f05ea4a08bbb6
      https://github.com/Evolveum/midpoint/commit/0c188e77de45b7f291e80c20f21f05ea4a08bbb6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/h2-3.7-all.sql
    R config/sql/_all/h2-upgrade-3.5-3.6.sql
    A config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql
    M config/sql/_all/h2-upgrade-3.6-3.7.sql
    M config/sql/_all/mysql-3.7-all.sql
    R config/sql/_all/mysql-upgrade-3.5-3.6.sql
    M config/sql/_all/mysql-upgrade-3.6-3.7.sql
    M config/sql/_all/oracle-3.7-all.sql
    R config/sql/_all/oracle-upgrade-3.5-3.6.sql
    M config/sql/_all/oracle-upgrade-3.6-3.7.sql
    M config/sql/_all/postgresql-3.7-all.sql
    R config/sql/_all/postgresql-upgrade-3.5-3.6.sql
    M config/sql/_all/postgresql-upgrade-3.6-3.7.sql
    M config/sql/_all/sqlserver-3.7-all.sql
    R config/sql/_all/sqlserver-upgrade-3.5-3.6.sql
    M config/sql/_all/sqlserver-upgrade-3.6-3.7.sql
    R config/sql/midpoint/3.5/h2/h2-3.5.sql
    R config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    R config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    R config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    R config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    R config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    R config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    R config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    R config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    R config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    R config/sql/midpoint/3.6/h2/h2-3.6.sql
    R config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    R config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    R config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    R config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    R config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    R config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    R config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    R config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    R config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.7/h2/h2-3.7.sql
    M config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql
    A config/sql/midpoint/3.7/mysql/mysql-3.7.sql
    M config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql
    A config/sql/midpoint/3.7/oracle/oracle-3.7.sql
    M config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql
    A config/sql/midpoint/3.7/postgresql/postgresql-3.7.sql
    M config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql
    A config/sql/midpoint/3.7/sqlserver/sqlserver-3.7.sql
    M config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql
    M config/sql/quartz/tables_h2.sql
    M config/sql/quartz/tables_mysql.sql
    M config/sql/quartz/tables_mysql_innodb.sql
    M config/sql/quartz/tables_oracle.sql
    M config/sql/quartz/tables_postgres.sql
    M config/sql/quartz/tables_sqlServer.sql
    M dist/src/main/bin/springboot.sh
    M dist/src/main/bin/start.sh
    M dist/src/main/bin/stop.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/Popupable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleRelationSelectionPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleRelationSelectionPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/logback.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.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/PrismBeanInspector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaProcessorUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.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/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/resources/common/xml/ns/wf-context.xml
    M infra/util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessage.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageBuilder.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageList.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageListBuilder.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/SingleLocalizableMessage.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/CommonException.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/ProfilingLogbackFilter.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ObjectValuePolicyEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    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/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.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/NoncePolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/PasswordPolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/SecurityQuestionsPolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M testing/longtest/pom.xml

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


  Commit: cd2adb30dc577574aa43393f979ed5e383c8b71e
      https://github.com/Evolveum/midpoint/commit/cd2adb30dc577574aa43393f979ed5e383c8b71e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  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/query2/restriction/ReferenceRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointImplicitNamingStrategy.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

  Log Message:
  -----------
  schema generation code cleanup, still some issues


  Commit: 8591b6d461db8de1fe9fc599d47f650112ce3a8b
      https://github.com/Evolveum/midpoint/commit/8591b6d461db8de1fe9fc599d47f650112ce3a8b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl/pom.xml

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


  Commit: 869df71b130637b0a5d90fe27f86e6e5b4a7f05a
      https://github.com/Evolveum/midpoint/commit/869df71b130637b0a5d90fe27f86e6e5b4a7f05a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-06 (Wed, 06 Dec 2017)

  Changed paths:
    A dist/src/main/bin/springboot.bat
    M dist/src/main/bin/start.bat
    M dist/src/main/bin/stop.bat
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.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/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.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/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test505InOidEmpty.xml
    M model/certification-api/pom.xml
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/CertificationManager.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestAdHocCertification.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/AccessCertificationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.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/RAccessCertificationCampaign.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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


  Commit: 400389a45d49e111372af32da86862ca35262921
      https://github.com/Evolveum/midpoint/commit/400389a45d49e111372af32da86862ca35262921
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-06 (Wed, 06 Dec 2017)

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

  Log Message:
  -----------
  generated schema now almost identical to previous one. not tested yet.


  Commit: bf39a90af25f4063383d25f3ed9036031795995d
      https://github.com/Evolveum/midpoint/commit/bf39a90af25f4063383d25f3ed9036031795995d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-06 (Wed, 06 Dec 2017)

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

  Log Message:
  -----------
  schema magic finished (at least I hope so)


  Commit: 1e9f6054f0c72f10c7d98e91bf437c340592b658
      https://github.com/Evolveum/midpoint/commit/1e9f6054f0c72f10c7d98e91bf437c340592b658
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-06 (Wed, 06 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-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/SchemaTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  more repository tests fixes, transactions don't seem to work


  Commit: 6d848fad92ab0f96195b025ecc235f85755f04a3
      https://github.com/Evolveum/midpoint/commit/6d848fad92ab0f96195b025ecc235f85755f04a3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-06 (Wed, 06 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointImplicitNamingStrategy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointPhysicalNamingStrategy.java

  Log Message:
  -----------
  removed logging from naming strategies


  Commit: 7ac0267e671272c11a80f4562414577505f0fbec
      https://github.com/Evolveum/midpoint/commit/7ac0267e671272c11a80f4562414577505f0fbec
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session-test.xml
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  transactions still not working


  Commit: a4b19364501c8f879e74ae73c98a0050b957376f
      https://github.com/Evolveum/midpoint/commit/a4b19364501c8f879e74ae73c98a0050b957376f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

  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/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.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/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.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
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageList.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/SingleLocalizableMessage.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M testing/story/src/test/resources/orgsync/task-reconcile-opendj-ldapgroup-single.xml

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


  Commit: 55010a9baa0750767b1678b1a47a0ec61fb4314b
      https://github.com/Evolveum/midpoint/commit/55010a9baa0750767b1678b1a47a0ec61fb4314b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

  Changed paths:
    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:
  -----------
  fixed constraints violation handling


  Commit: b574c1a0456615f6fb1df84e13d78a0b3040d21b
      https://github.com/Evolveum/midpoint/commit/b574c1a0456615f6fb1df84e13d78a0b3040d21b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

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

  Log Message:
  -----------
  removed old naming strategy


  Commit: f43efd9f23edfef3f822f94f3732c276fb62594e
      https://github.com/Evolveum/midpoint/commit/f43efd9f23edfef3f822f94f3732c276fb62594e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test595Logicals2.xml

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


  Commit: eb7fde852459ed899b54f0bda46c831bd6f571f1
      https://github.com/Evolveum/midpoint/commit/eb7fde852459ed899b54f0bda46c831bd6f571f1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-07 (Thu, 07 Dec 2017)

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

  Log Message:
  -----------
  audit service can't compile


  Commit: 41eec9d507aece879460e1bc9c0c3082214614a3
      https://github.com/Evolveum/midpoint/commit/41eec9d507aece879460e1bc9c0c3082214614a3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationTestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/CommonException.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/FunctionExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestGroovyExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestJavaScriptExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestPythonExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestXPathExpressions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/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/policy/evaluators/ExclusionConstraintEvaluator.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/AbstractObjectResolvableExpressionEvaluator.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/AbstractObjectResolvableExpressionEvaluatorFactory.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionFactory.java
    M repo/repo-test-util/src/main/resources/ctx-expression-test.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/logback-test.xml
    M testing/story/src/test/resources/village/org-project-jolly-roger.xml

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


  Commit: 7d5002392796d4bd6282eff55a13151cd7283377
      https://github.com/Evolveum/midpoint/commit/7d5002392796d4bd6282eff55a13151cd7283377
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

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

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


  Commit: 8ca3973dd04e39a1b8757bb39fa432e5e0d88760
      https://github.com/Evolveum/midpoint/commit/8ca3973dd04e39a1b8757bb39fa432e5e0d88760
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

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

  Log Message:
  -----------
  midpoint compiles, audit cleanup doesn't work


  Commit: 25da5b72758bbfe8afe143d9e84db070b924821f
      https://github.com/Evolveum/midpoint/commit/25da5b72758bbfe8afe143d9e84db070b924821f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    A dist/src/main/bin/midpoint.bat
    A dist/src/main/bin/midpoint.sh
    R dist/src/main/bin/springboot.bat
    R dist/src/main/bin/springboot.sh
    M dist/src/main/bin/start.bat
    M dist/src/main/bin/start.sh
    M dist/src/main/bin/stop.bat
    M dist/src/main/bin/stop.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NonceAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityQuestionAuthneticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowProcessEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AdUtils.java
    M testing/conntest/src/test/resources/ad-ldap/resource-raw-localhost.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/science/role-statistics.xml

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


  Commit: 83ca7f0cb4cfec82775ef4988f4b8ead88a6c53e
      https://github.com/Evolveum/midpoint/commit/83ca7f0cb4cfec82775ef4988f4b8ead88a6c53e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-09 (Sat, 09 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.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/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/testng-integration.xml

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


  Commit: afe6e3380e001452b2479ec1104a0edf963a3d8b
      https://github.com/Evolveum/midpoint/commit/afe6e3380e001452b2479ec1104a0edf963a3d8b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  Changed paths:
    M build-system/pom.xml
    M dist/src/main/bin/midpoint.bat
    M dist/src/main/bin/midpoint.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.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 provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

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


  Commit: 1ef5ca62cdbb7120ee5c7835591b7c0125fcc083
      https://github.com/Evolveum/midpoint/commit/1ef5ca62cdbb7120ee5c7835591b7c0125fcc083
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  Changed paths:
    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/MidPointPostgreSQLDialect.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java

  Log Message:
  -----------
  audit implementation almost fixed


  Commit: fdcc0b5d57aa4b62288689544c1835960f2ca7a3
      https://github.com/Evolveum/midpoint/commit/fdcc0b5d57aa4b62288689544c1835960f2ca7a3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

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

  Log Message:
  -----------
  audit cleanup bugfix


  Commit: 6bc400ee8e5e3c5ec8243538c85cadf0f830ee7e
      https://github.com/Evolveum/midpoint/commit/6bc400ee8e5e3c5ec8243538c85cadf0f830ee7e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.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/CredentialsProcessor.java

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


  Commit: af0f43835a33d1213afcea2b556426defb57879d
      https://github.com/Evolveum/midpoint/commit/af0f43835a33d1213afcea2b556426defb57879d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  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/RAuditPropertyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditReferenceValue.java

  Log Message:
  -----------
  removed sequences, used identity column for audit tables


  Commit: 0d7fe3ab9ac85bbeac8fc5ebdfa5b9de8b9263d9
      https://github.com/Evolveum/midpoint/commit/0d7fe3ab9ac85bbeac8fc5ebdfa5b9de8b9263d9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

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

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


  Commit: e5a53d1668b845832f5e8bdd9f6e41fde7fd2ce4
      https://github.com/Evolveum/midpoint/commit/e5a53d1668b845832f5e8bdd9f6e41fde7fd2ce4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-12 (Tue, 12 Dec 2017)

  Changed paths:
    M dist/src/main/bin/midpoint.sh
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    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/main/resources/localization/schema.properties
    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

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


  Commit: c994e84e6c055c49c75f78b3041be725d069745e
      https://github.com/Evolveum/midpoint/commit/c994e84e6c055c49c75f78b3041be725d069745e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-15 (Fri, 15 Dec 2017)

  Changed paths:
    M INSTALL
    M INSTALL-dist
    M NEWS
    M README
    M README.md
    M RELEASE-NOTES
    M config/initial-objects/010-value-policy.xml
    A config/initial-objects/015-security-policy.xml
    M config/initial-objects/020-system-configuration.xml
    M config/initial-objects/040-role-enduser.xml
    M config/initial-objects/041-role-approver.xml
    M config/initial-objects/043-role-delegator.xml
    M config/initial-objects/110-report-user-list.xml
    R config/initial-objects/120-security-policy.xml
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml
    M dist/pom.xml
    M dist/src/main/assembly/dist.xml
    M dist/src/main/bin/midpoint.sh
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/LoadableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/helpers/AvailableResponses.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageOperationResult.java
    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/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/application.yml
    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/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    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/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ObjectValuePolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.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/SecurityQuestionsPolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/resources/lens/template-dynamic-org-assignment.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.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
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects-2.xml
    M repo/security-api/pom.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M testing/story/pom.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/TestNullAttribute.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    R testing/story/src/test/resources/delivery/schema/rules.xsd
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/schema/delivery.xsd
    M testing/story/src/test/resources/strings/users/lechuck-deputy-deputy.xml
    M testing/wstest/pom.xml
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/pom.xml
    R tools/repo-ninja/.gitignore
    R tools/repo-ninja/maven/maven-wrapper.jar
    R tools/repo-ninja/maven/maven-wrapper.properties
    R tools/repo-ninja/mvnw
    R tools/repo-ninja/mvnw.bat
    R tools/repo-ninja/pom.xml
    R tools/repo-ninja/src/main/assembly/bin.xml
    R tools/repo-ninja/src/main/bin/repo-ninja
    R tools/repo-ninja/src/main/bin/repo-ninja.bat
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDL.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDLConfig.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/LightweightIdentifierGeneratorMock.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/Main.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/RepoValidator.java
    R tools/repo-ninja/src/main/resources/ctx-ninja.xml
    R tools/repo-ninja/src/main/resources/logback.xml
    R tools/repo-ninja/src/other/ninja.sh
    R tools/repo-ninja/src/other/run.sh
    R tools/repo-ninja/src/test/resources/midpoint-home/config.xml
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/extension.xsd
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/foo.xsd
    R tools/repo-ninja/src/test/resources/objects.xml
    R tools/repo-ninja/testng-integration.xml
    R tools/repo-ninja/testng-unit.xml
    R tools/repo-ninja/usage.txt
    M weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


  Commit: 62e140b68f6ab77a4985807ad431a156eb008102
      https://github.com/Evolveum/midpoint/commit/62e140b68f6ab77a4985807ad431a156eb008102
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-17 (Sun, 17 Dec 2017)

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

  Log Message:
  -----------
  name resolution helper fix


  Commit: b1e0f100bee234ce5c620ad81e80d8309e7961b3
      https://github.com/Evolveum/midpoint/commit/b1e0f100bee234ce5c620ad81e80d8309e7961b3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-17 (Sun, 17 Dec 2017)

  Changed paths:
    M model/report-impl/src/test/resources/reports/report-user-list-script.xml

  Log Message:
  -----------
  fixed report tests


  Commit: 500384536300a98eee575b560113fb2ab3aaee3a
      https://github.com/Evolveum/midpoint/commit/500384536300a98eee575b560113fb2ab3aaee3a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sample-configurations/mysql.properties
    M repo/repo-sql-impl-test/sample-configurations/oracle.properties
    M repo/repo-sql-impl-test/sample-configurations/postgresql.properties
    M repo/repo-sql-impl-test/sample-configurations/sqlserver.properties
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java

  Log Message:
  -----------
  fix in repo test initialization


  Commit: 4d43152b786d9cd9ecd564e1224dac7f0228695d
      https://github.com/Evolveum/midpoint/commit/4d43152b786d9cd9ecd564e1224dac7f0228695d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M NEWS
    M README
    M README.md
    M build-system/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M dist/src/main/bin/midpoint.bat
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/ws-util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/pom.xml
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    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/SearchIterativeTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl/pom.xml
    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/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryEngine2.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/minipoint/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/sanity/pom.xml
    M testing/selenidetest/pom.xml
    M testing/story/pom.xml
    M testing/wstest/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/Main.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/DeleteRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteRestAction.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/ImportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ListKeysRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Command.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/NinjaContext.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/DeleteOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ListKeysOptions.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/CountStatus.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/Log.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/resources/messages.properties
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

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


  Commit: 746c5fba39edada7354e96c22c168b350787a943
      https://github.com/Evolveum/midpoint/commit/746c5fba39edada7354e96c22c168b350787a943
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sample-configurations/mysql.properties
    M repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

  Log Message:
  -----------
  repo tests fixes when running on mysql


  Commit: ca98b776d445ef980188d54578b862f672c25c05
      https://github.com/Evolveum/midpoint/commit/ca98b776d445ef980188d54578b862f672c25c05
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-intest/src/test/resources/rbac/role-honorability.xml

  Log Message:
  -----------
  Fixes MID-4354: NPE in Projector when assigning role with a non-null but empty extension

(cherry picked from commit 5e0c73f)


  Commit: 599eafa4814035fa112fe345beaa4ac9ffbda871
      https://github.com/Evolveum/midpoint/commit/599eafa4814035fa112fe345beaa4ac9ffbda871
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/Main.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/DeleteRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteRestAction.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/ImportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ListKeysRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Command.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/NinjaContext.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/DeleteOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ListKeysOptions.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/CountStatus.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/Log.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/post-3.7-fixes' into post-3.7-fixes


  Commit: b1a452d5751a1510dc7c4bf597c9e4ff313d401f
      https://github.com/Evolveum/midpoint/commit/b1a452d5751a1510dc7c4bf597c9e4ff313d401f
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

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

  Log Message:
  -----------
  MID-4223 assignment effective status label


  Commit: b874ad7048fd908f1ec59dac2174ac408f2d3607
      https://github.com/Evolveum/midpoint/commit/b874ad7048fd908f1ec59dac2174ac408f2d3607
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-intest/src/test/resources/rbac/role-honorability.xml

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


  Commit: 8387e81309c998053e5eada597e2f6fd4e86cd83
      https://github.com/Evolveum/midpoint/commit/8387e81309c998053e5eada597e2f6fd4e86cd83
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sample-configurations/mysql.properties
    M repo/repo-sql-impl-test/sample-configurations/oracle.properties
    M repo/repo-sql-impl-test/sample-configurations/postgresql.properties
    M repo/repo-sql-impl-test/sample-configurations/sqlserver.properties

  Log Message:
  -----------
  disable schema validation in tests


  Commit: 5629b68484430653420278174c4c20ddd3242098
      https://github.com/Evolveum/midpoint/commit/5629b68484430653420278174c4c20ddd3242098
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/oracle.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/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
    M repo/repo-sql-impl-test/testng-integration.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointOracleDialect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java

  Log Message:
  -----------
  some schema updates, dialect improvements, schema generation improvements


  Commit: 518d9a0e9bd9368df0ea70138f37ca7136e2347b
      https://github.com/Evolveum/midpoint/commit/518d9a0e9bd9368df0ea70138f37ca7136e2347b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

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

  Log Message:
  -----------
  remove unnecessary initrans clauses


  Commit: 433bf2208186e2a694ce09d2e2d32ae2c7f7ac9e
      https://github.com/Evolveum/midpoint/commit/433bf2208186e2a694ce09d2e2d32ae2c7f7ac9e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

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

  Log Message:
  -----------
  updated sql scripts, removed sequence table


  Commit: 7c2b76870f9e584fee3cf3487798c2d9a7c07bda
      https://github.com/Evolveum/midpoint/commit/7c2b76870f9e584fee3cf3487798c2d9a7c07bda
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    A tools/midpoint-war-layout/maven/maven-wrapper.jar
    A tools/midpoint-war-layout/maven/maven-wrapper.properties
    A tools/midpoint-war-layout/mvnw
    A tools/midpoint-war-layout/mvnw.bat
    A tools/ninja/maven/maven-wrapper.jar
    A tools/ninja/maven/maven-wrapper.properties
    A tools/ninja/mvnw
    A tools/ninja/mvnw.bat

  Log Message:
  -----------
  added missing mvn wrappers to ninja and midpoint war layout module


  Commit: cc9bf130cc7b393fe6ee8af920814c5e9a7e02d0
      https://github.com/Evolveum/midpoint/commit/cc9bf130cc7b393fe6ee8af920814c5e9a7e02d0
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

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

  Log Message:
  -----------
  menu items visibility fix


  Commit: 945858f66c4fa052a743a1d42bdf89b397c7f336
      https://github.com/Evolveum/midpoint/commit/945858f66c4fa052a743a1d42bdf89b397c7f336
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

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

  Log Message:
  -----------
  removed some deprecated code


  Commit: 66ee801d8620e1c49bb1645e5780354b9825d855
      https://github.com/Evolveum/midpoint/commit/66ee801d8620e1c49bb1645e5780354b9825d855
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml

  Log Message:
  -----------
  Fixes MID-4355: Global policy rules are applied even if they should not be

(cherry picked from commit fdb6b57)


  Commit: cd935df7463e08863ed37893ca13afed05412b2f
      https://github.com/Evolveum/midpoint/commit/cd935df7463e08863ed37893ca13afed05412b2f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/post-3.7-fixes' into post-3.7-fixes


  Commit: 425a585af119a2587063536a467972e85468abe0
      https://github.com/Evolveum/midpoint/commit/425a585af119a2587063536a467972e85468abe0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

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

  Log Message:
  -----------
  Forgotten fix (MID-4355).


  Commit: 618a97803481201cd4e57cb343af9e6c647be2fc
      https://github.com/Evolveum/midpoint/commit/618a97803481201cd4e57cb343af9e6c647be2fc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Adds two forgotten localization keys.


  Commit: e38247c6953018bfcff11513d83bccf1c3d95784
      https://github.com/Evolveum/midpoint/commit/e38247c6953018bfcff11513d83bccf1c3d95784
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/helpers/AvailableResponses.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/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageOperationResult.java
    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/security/MidPointGuiAuthorizationEvaluator.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/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/resources/lens/template-dynamic-org-assignment.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    R testing/story/src/test/resources/delivery/schema/rules.xsd
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/schema/delivery.xsd
    M testing/story/src/test/resources/strings/users/lechuck-deputy-deputy.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/pom.xml
    R tools/repo-ninja/.gitignore
    R tools/repo-ninja/maven/maven-wrapper.jar
    R tools/repo-ninja/maven/maven-wrapper.properties
    R tools/repo-ninja/mvnw
    R tools/repo-ninja/mvnw.bat
    R tools/repo-ninja/pom.xml
    R tools/repo-ninja/src/main/assembly/bin.xml
    R tools/repo-ninja/src/main/bin/repo-ninja
    R tools/repo-ninja/src/main/bin/repo-ninja.bat
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDL.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDLConfig.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/LightweightIdentifierGeneratorMock.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/Main.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/RepoValidator.java
    R tools/repo-ninja/src/main/resources/ctx-ninja.xml
    R tools/repo-ninja/src/main/resources/logback.xml
    R tools/repo-ninja/src/other/ninja.sh
    R tools/repo-ninja/src/other/run.sh
    R tools/repo-ninja/src/test/resources/midpoint-home/config.xml
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/extension.xsd
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/foo.xsd
    R tools/repo-ninja/src/test/resources/objects.xml
    R tools/repo-ninja/testng-integration.xml
    R tools/repo-ninja/testng-unit.xml
    R tools/repo-ninja/usage.txt

  Log Message:
  -----------
  Merge commit '203cb4370b7d5b424b34d7bfab7fbb414bd445d2' into post-3.7-fixes


  Commit: 27ace21ae6404d27af381bc38d79f5ad6cdf5f10
      https://github.com/Evolveum/midpoint/commit/27ace21ae6404d27af381bc38d79f5ad6cdf5f10
  Author: Slavomir Surmanek <slavomir.surmanek at student.tuke.sk>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    A samples/resources/jira/GroupAdministratorOfProject-role.xml
    A samples/resources/jira/GroupDeveloperOfProject-role.xml
    A samples/resources/jira/GroupTemplate-object_template.xml
    A samples/resources/jira/JIRAAccount-role.xml
    A samples/resources/jira/JIRAGroup-role.xml
    A samples/resources/jira/JIRAGroupMembershipMetarole-role.xml
    A samples/resources/jira/JIRAProject-role.xml
    A samples/resources/jira/Jira-resource.xml
    A samples/resources/jira/ProjectTemplate-object_template.xml
    A samples/resources/jira/UserAdministratorOfProject-role.xml
    A samples/resources/jira/UserDeveloperOfProject-role.xml
    A samples/resources/jira/UserTemplate-object_template.xml

  Log Message:
  -----------
  added Jira samples


  Commit: 44c3bad8996c62a1ccc33b93e3e067d3c6dd9329
      https://github.com/Evolveum/midpoint/commit/44c3bad8996c62a1ccc33b93e3e067d3c6dd9329
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

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

  Log Message:
  -----------
  Schema for delayed manual operations (MID-4347)


  Commit: c2ef6bb1d894b556a648dba5f1e3349cd795983f
      https://github.com/Evolveum/midpoint/commit/c2ef6bb1d894b556a648dba5f1e3349cd795983f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

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

  Log Message:
  -----------
  fix in oracle db script


  Commit: 00d97d0750634e5535b8177473abef0bd48ce2c4
      https://github.com/Evolveum/midpoint/commit/00d97d0750634e5535b8177473abef0bd48ce2c4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M repo/repo-sql-impl-test/sample-configurations/oracle.properties
    M repo/repo-sql-impl-test/sample-configurations/postgresql.properties
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  oracle fixes


  Commit: bbd641a14c95acb16b04828006a50c072eb2f660
      https://github.com/Evolveum/midpoint/commit/bbd641a14c95acb16b04828006a50c072eb2f660
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M model/report-impl/src/test/resources/reports/report-user-list-script.xml

  Log Message:
  -----------
  report post script fix


  Commit: bfc85f2264064750685e7b81193dd824832cf30f
      https://github.com/Evolveum/midpoint/commit/bfc85f2264064750685e7b81193dd824832cf30f
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-21 (Thu, 21 Dec 2017)

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

  Log Message:
  -----------
  MID-4356 fix (npe on the assignments tab)


  Commit: 37aafbadde02ee41ef83174d334944f805265724
      https://github.com/Evolveum/midpoint/commit/37aafbadde02ee41ef83174d334944f805265724
  Author: skublik <lukas.skublik at gmail.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    A samples/objects/object-template-user-target.xml

  Log Message:
  -----------
  added example of object template for tutorial video


  Commit: 2ae4f54f8e5acca4c52ed1df65f75f48898de98f
      https://github.com/Evolveum/midpoint/commit/2ae4f54f8e5acca4c52ed1df65f75f48898de98f
  Author: Slavomir Surmanek <31924425+ssurmanek at users.noreply.github.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M samples/resources/jira/GroupAdministratorOfProject-role.xml

  Log Message:
  -----------
  Cleared metadata


  Commit: c6613b41d326afa628dd1a831515ad724c487236
      https://github.com/Evolveum/midpoint/commit/c6613b41d326afa628dd1a831515ad724c487236
  Author: skublik <lskublik at evolveum.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M samples/objects/object-template-user-target.xml

  Log Message:
  -----------
  modifying of sample


  Commit: bbab70e336d9de409c3d27b1dacc64b638fc4b80
      https://github.com/Evolveum/midpoint/commit/bbab70e336d9de409c3d27b1dacc64b638fc4b80
  Author: Slavomir Surmanek <ssurmanek at evolveum.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M samples/resources/jira/GroupDeveloperOfProject-role.xml
    M samples/resources/jira/GroupTemplate-object_template.xml
    M samples/resources/jira/JIRAAccount-role.xml
    M samples/resources/jira/JIRAGroup-role.xml
    M samples/resources/jira/JIRAGroupMembershipMetarole-role.xml
    M samples/resources/jira/JIRAProject-role.xml
    M samples/resources/jira/Jira-resource.xml
    M samples/resources/jira/ProjectTemplate-object_template.xml
    M samples/resources/jira/UserAdministratorOfProject-role.xml
    M samples/resources/jira/UserDeveloperOfProject-role.xml
    M samples/resources/jira/UserTemplate-object_template.xml

  Log Message:
  -----------
  cleared metadata


  Commit: 643a5cb1eb771b9e076a471c0dd7909936182a84
      https://github.com/Evolveum/midpoint/commit/643a5cb1eb771b9e076a471c0dd7909936182a84
  Author: Slavomir Surmanek <ssurmanek at evolveum.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M samples/objects/object-template-user-target.xml

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


  Commit: c12b6f2e7f289addb34d09f206fac62d995bc583
      https://github.com/Evolveum/midpoint/commit/c12b6f2e7f289addb34d09f206fac62d995bc583
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.java
    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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixing assignment authorization issues


  Commit: c9c055715924c8252c4c8e85cf7864e48fc7b555
      https://github.com/Evolveum/midpoint/commit/c9c055715924c8252c4c8e85cf7864e48fc7b555
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java

  Log Message:
  -----------
  relation drop down on the org members panel


  Commit: ccbdf835214b49ee675ebd8c0e9479a156805e94
      https://github.com/Evolveum/midpoint/commit/ccbdf835214b49ee675ebd8c0e9479a156805e94
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.java
    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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 2d5eb727fa4ad97c3193b193641cb2f9f995b5f9
      https://github.com/Evolveum/midpoint/commit/2d5eb727fa4ad97c3193b193641cb2f9f995b5f9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

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

  Log Message:
  -----------
  Task variable in post-report script


  Commit: c9b02cd0fc64be32100a795e46cd463dcd6d4540
      https://github.com/Evolveum/midpoint/commit/c9b02cd0fc64be32100a795e46cd463dcd6d4540
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-26 (Tue, 26 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  relation column in the org members table


  Commit: 1c5cdbcb2790031e29c310425d88680e84dc4b98
      https://github.com/Evolveum/midpoint/commit/1c5cdbcb2790031e29c310425d88680e84dc4b98
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-26 (Tue, 26 Dec 2017)

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

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


  Commit: 54a79f5019aed3b1257e3a779b27788a37d17ba7
      https://github.com/Evolveum/midpoint/commit/54a79f5019aed3b1257e3a779b27788a37d17ba7
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-27 (Wed, 27 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java

  Log Message:
  -----------
  MID-4358 assign all assignments fix


  Commit: 20ce275176eb74f6e62fdabec390d5113c3bb2dd
      https://github.com/Evolveum/midpoint/commit/20ce275176eb74f6e62fdabec390d5113c3bb2dd
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-27 (Wed, 27 Dec 2017)

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

  Log Message:
  -----------
  select all assignments fix


  Commit: d09ee7cf7931e680daea4184ccfc52c581ba58e3
      https://github.com/Evolveum/midpoint/commit/d09ee7cf7931e680daea4184ccfc52c581ba58e3
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-27 (Wed, 27 Dec 2017)

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

  Log Message:
  -----------
  some style improvements


  Commit: 46ba0b103ca129f3adcfe268fb97910167c65ff2
      https://github.com/Evolveum/midpoint/commit/46ba0b103ca129f3adcfe268fb97910167c65ff2
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-29 (Fri, 29 Dec 2017)

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

  Log Message:
  -----------
  improvements for association panel


  Commit: 6f16c8e46a860aecf4af812d3c6bd888ed4ccd60
      https://github.com/Evolveum/midpoint/commit/6f16c8e46a860aecf4af812d3c6bd888ed4ccd60
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AbstractAssociationWrapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ResourceAssociationWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ShadowAssociationWrapper.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

  Log Message:
  -----------
  association wrapper for resource


  Commit: 89a33329f9dc520d61f19c4f242e4c98a702f9c5
      https://github.com/Evolveum/midpoint/commit/89a33329f9dc520d61f19c4f242e4c98a702f9c5
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M NEWS
    M README
    M README.md
    M build-system/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M dist/src/main/bin/midpoint.bat
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/ws-util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/util/AbstractSearchIterativeTaskHandler.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/resources/rbac/role-honorability.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/pom.xml
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    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/SearchIterativeTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl/pom.xml
    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/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryEngine2.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/model-client-sample/pom.xml
    A samples/objects/object-template-user-target.xml
    M samples/pom.xml
    A samples/resources/jira/GroupAdministratorOfProject-role.xml
    A samples/resources/jira/GroupDeveloperOfProject-role.xml
    A samples/resources/jira/GroupTemplate-object_template.xml
    A samples/resources/jira/JIRAAccount-role.xml
    A samples/resources/jira/JIRAGroup-role.xml
    A samples/resources/jira/JIRAGroupMembershipMetarole-role.xml
    A samples/resources/jira/JIRAProject-role.xml
    A samples/resources/jira/Jira-resource.xml
    A samples/resources/jira/ProjectTemplate-object_template.xml
    A samples/resources/jira/UserAdministratorOfProject-role.xml
    A samples/resources/jira/UserDeveloperOfProject-role.xml
    A samples/resources/jira/UserTemplate-object_template.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/minipoint/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/sanity/pom.xml
    M testing/selenidetest/pom.xml
    M testing/story/pom.xml
    M testing/wstest/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/Main.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/DeleteRepositoryAction.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteRestAction.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/ImportRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ListKeysRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Command.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/NinjaContext.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/DeleteOptions.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ListKeysOptions.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/CountStatus.java
    A tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/Log.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
    M tools/ninja/src/main/resources/messages.properties
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

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


  Commit: ebb1c14b273daf3bf3729c73e4ca29bb12e35951
      https://github.com/Evolveum/midpoint/commit/ebb1c14b273daf3bf3729c73e4ca29bb12e35951
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.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/projector/policy/PolicyRuleProcessor.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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    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: 0175669fec8e7885e680f7cf2f19db4852eec3d0
      https://github.com/Evolveum/midpoint/commit/0175669fec8e7885e680f7cf2f19db4852eec3d0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/helpers/AvailableResponses.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/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageOperationResult.java
    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/security/MidPointGuiAuthorizationEvaluator.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/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.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/projector/SmartAssignmentKey.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    A model/model-impl/src/test/resources/lens/template-dynamic-org-assignment.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    R testing/story/src/test/resources/delivery/schema/rules.xsd
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/schema/delivery.xsd
    M testing/story/src/test/resources/strings/users/lechuck-deputy-deputy.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/ConnectionOptions.java
    M tools/pom.xml
    R tools/repo-ninja/.gitignore
    R tools/repo-ninja/maven/maven-wrapper.jar
    R tools/repo-ninja/maven/maven-wrapper.properties
    R tools/repo-ninja/mvnw
    R tools/repo-ninja/mvnw.bat
    R tools/repo-ninja/pom.xml
    R tools/repo-ninja/src/main/assembly/bin.xml
    R tools/repo-ninja/src/main/bin/repo-ninja
    R tools/repo-ninja/src/main/bin/repo-ninja.bat
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDL.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportDDLConfig.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ImportObjects.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/LightweightIdentifierGeneratorMock.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/Main.java
    R tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/RepoValidator.java
    R tools/repo-ninja/src/main/resources/ctx-ninja.xml
    R tools/repo-ninja/src/main/resources/logback.xml
    R tools/repo-ninja/src/other/ninja.sh
    R tools/repo-ninja/src/other/run.sh
    R tools/repo-ninja/src/test/resources/midpoint-home/config.xml
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/extension.xsd
    R tools/repo-ninja/src/test/resources/midpoint-home/schema/foo.xsd
    R tools/repo-ninja/src/test/resources/objects.xml
    R tools/repo-ninja/testng-integration.xml
    R tools/repo-ninja/testng-unit.xml
    R tools/repo-ninja/usage.txt

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes' into feature/manual-improvements


  Commit: ce02824c10ffdbde8c71b8be6865e46e76a1db94
      https://github.com/Evolveum/midpoint/commit/ce02824c10ffdbde8c71b8be6865e46e76a1db94
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  induced entitlements tab


  Commit: d6f44085fbae5c98e6800927c78306c61bfaefae
      https://github.com/Evolveum/midpoint/commit/d6f44085fbae5c98e6800927c78306c61bfaefae
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.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/projector/policy/PolicyRuleProcessor.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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: a2992f1e306410a9510e9fc3ee41cd94f86030ac
      https://github.com/Evolveum/midpoint/commit/a2992f1e306410a9510e9fc3ee41cd94f86030ac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationResult.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
    A 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/TestManual.java
    A 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/TestSemiManual.java
    A model/model-intest/src/test/resources/manual/resource-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-manual-grouping.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningOperationState.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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Provisioning operation grouping implementation in progress (MID-4347)


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java

  Log Message:
  -----------
  ItemPathType preview


  Commit: 4ac5f4791bde58b4bd9a6d7df21d8eaa853fdc2b
      https://github.com/Evolveum/midpoint/commit/4ac5f4791bde58b4bd9a6d7df21d8eaa853fdc2b
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java

  Log Message:
  -----------
  fixed hashCode in LayeredRefinedAttributeDefinitionImpl breaking the equals contract (courtesy of arnost-starosta)


  Commit: b087daeb0cad15e8ca4be37b4b1ac7a5752f6edb
      https://github.com/Evolveum/midpoint/commit/b087daeb0cad15e8ca4be37b4b1ac7a5752f6edb
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java

  Log Message:
  -----------
  fixed hashCode in LayeredRefinedAttributeDefinitionImpl breaking the equals contract (courtesy of arnost-starosta)


  Commit: 8db1507e6fab15160e5797b175c5a1a0a53528c9
      https://github.com/Evolveum/midpoint/commit/8db1507e6fab15160e5797b175c5a1a0a53528c9
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AbstractAssociationWrapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ResourceAssociationWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ShadowAssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.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/projector/policy/PolicyRuleProcessor.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
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 228fe999f323bdb551214f289a42e5ac3529aa2d
      https://github.com/Evolveum/midpoint/commit/228fe999f323bdb551214f289a42e5ac3529aa2d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/InducedEntitlementsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AbstractAssociationWrapper.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ResourceAssociationWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ShadowAssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.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/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    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/SchemaTransformer.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/policy/PolicyRuleProcessor.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/rbac/role-honorability.xml
    A model/model-intest/src/test/resources/security/role-exclusion-pirate.xml
    A model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/resources/policy/role-role1.xml
    M model/workflow-impl/src/test/resources/policy/role-role10.xml
    M model/workflow-impl/src/test/resources/policy/role-role10a.xml
    M model/workflow-impl/src/test/resources/policy/role-role10b.xml
    M model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/role-role1a.xml
    M model/workflow-impl/src/test/resources/policy/role-role1b.xml
    M model/workflow-impl/src/test/resources/policy/role-role2.xml
    M model/workflow-impl/src/test/resources/policy/role-role2a.xml
    M model/workflow-impl/src/test/resources/policy/role-role2b.xml
    M model/workflow-impl/src/test/resources/policy/role-role3.xml
    M model/workflow-impl/src/test/resources/policy/role-role3a.xml
    M model/workflow-impl/src/test/resources/policy/role-role3b.xml
    M model/workflow-impl/src/test/resources/policy/role-role4.xml
    M model/workflow-impl/src/test/resources/policy/role-role4a.xml
    M model/workflow-impl/src/test/resources/policy/role-role4b.xml
    A model/workflow-impl/src/test/resources/policy/user-jack-deputy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/OrgRestriction.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/AccessDecision.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    A samples/objects/object-template-user-target.xml
    A samples/resources/jira/GroupAdministratorOfProject-role.xml
    A samples/resources/jira/GroupDeveloperOfProject-role.xml
    A samples/resources/jira/GroupTemplate-object_template.xml
    A samples/resources/jira/JIRAAccount-role.xml
    A samples/resources/jira/JIRAGroup-role.xml
    A samples/resources/jira/JIRAGroupMembershipMetarole-role.xml
    A samples/resources/jira/JIRAProject-role.xml
    A samples/resources/jira/Jira-resource.xml
    A samples/resources/jira/ProjectTemplate-object_template.xml
    A samples/resources/jira/UserAdministratorOfProject-role.xml
    A samples/resources/jira/UserDeveloperOfProject-role.xml
    A samples/resources/jira/UserTemplate-object_template.xml

  Log Message:
  -----------
  Merge commit 'd6f4408' into feature/hibernate5


  Commit: 1e8cda9332f2e47b051f09dc549c40992536a21e
      https://github.com/Evolveum/midpoint/commit/1e8cda9332f2e47b051f09dc549c40992536a21e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

  Log Message:
  -----------
  Fix handling of redundant block-endblock pairs in QI

The bug was that if query interpreter got block-endblock calls pair
containing empty 'type' or 'exists' restriction, it would fail to
process it.


  Commit: 90b4dbf119cddcc8bed6abfc6006888a730bad28
      https://github.com/Evolveum/midpoint/commit/90b4dbf119cddcc8bed6abfc6006888a730bad28
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

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

  Log Message:
  -----------
  multiple expression value fix


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

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


  Commit: 5ee1242d2c40d04d6c546d4d4bfff8e823801e0e
      https://github.com/Evolveum/midpoint/commit/5ee1242d2c40d04d6c546d4d4bfff8e823801e0e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

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

  Log Message:
  -----------
  fixing repository tests

(cherry picked from commit 357237f)


  Commit: 54112a0ad266f8cd3f3024111a195fb064f79ae6
      https://github.com/Evolveum/midpoint/commit/54112a0ad266f8cd3f3024111a195fb064f79ae6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeModelTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexTaskHandler.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/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningOperationState.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheFactory.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 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/PropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/pom.xml
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/TaskHandlerUtil.java

  Log Message:
  -----------
  More progress on provisioning operation grouping (MID-4347)


  Commit: 4f67f21853a1c9584588d6392d8cbfc4ac4e40c1
      https://github.com/Evolveum/midpoint/commit/4f67f21853a1c9584588d6392d8cbfc4ac4e40c1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.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/TestSemiManualDisable.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-manual-grouping.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Provisioning operation grouping nearing completion (MID-4347)


  Commit: e2125c86ce4a53c78c81dba1469384ced54a2d5f
      https://github.com/Evolveum/midpoint/commit/e2125c86ce4a53c78c81dba1469384ced54a2d5f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

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

  Log Message:
  -----------
  prepared upgrade scripts for h2, mysql, postgres


  Commit: 86f2ba34418084438bf663a49545e16a27b66590
      https://github.com/Evolveum/midpoint/commit/86f2ba34418084438bf663a49545e16a27b66590
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ResourceAssociationWrapper.java

  Log Message:
  -----------
  some more Induced entitlements implementation


  Commit: 7f73c4cf3a131a97c83c91c3e92b9e53ed87c6aa
      https://github.com/Evolveum/midpoint/commit/7f73c4cf3a131a97c83c91c3e92b9e53ed87c6aa
  Author: kate <honchar at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java

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


  Commit: e118c9ec591f785ffc76ce97470e8654d9ae7c27
      https://github.com/Evolveum/midpoint/commit/e118c9ec591f785ffc76ce97470e8654d9ae7c27
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 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/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
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    A 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/CsvDisablingBackingStore.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/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGrouping.java
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java

  Log Message:
  -----------
  More tests and fixes for provisioning propagation (MID-4347)


  Commit: 7b8f392c1f2e6b05b4ae0a7d1659eba6598403a3
      https://github.com/Evolveum/midpoint/commit/7b8f392c1f2e6b05b4ae0a7d1659eba6598403a3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

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

  Log Message:
  -----------
  I dunno what to do with oracle and sql server


  Commit: d54e7489d4426d303e25af138f307dfd3f637c3c
      https://github.com/Evolveum/midpoint/commit/d54e7489d4426d303e25af138f307dfd3f637c3c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 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:
  -----------
  drop create scripts for audit table update for oracle and sql server


  Commit: 97b5c6fc67c66bdda6a3f723d156db6d73cfcc67
      https://github.com/Evolveum/midpoint/commit/97b5c6fc67c66bdda6a3f723d156db6d73cfcc67
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducementDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ResourceAssociationWrapper.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java

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


  Commit: 81223344f18a1cc42a2adff639533451277986d4
      https://github.com/Evolveum/midpoint/commit/81223344f18a1cc42a2adff639533451277986d4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java

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


  Commit: 1e1031cbb3427f7ae7553bd36336998ce7720fb3
      https://github.com/Evolveum/midpoint/commit/1e1031cbb3427f7ae7553bd36336998ce7720fb3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeModelTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
    A 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
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    A 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/CsvDisablingBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManual.java
    A 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/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A 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/resource-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningOperationState.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheFactory.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 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/PropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/pom.xml
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/TaskHandlerUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'feature/manual-improvements'


  Commit: 3bf0e45c7e93c6b60057135275a9dff6383666b0
      https://github.com/Evolveum/midpoint/commit/3bf0e45c7e93c6b60057135275a9dff6383666b0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M repo/repo-common/pom.xml

  Log Message:
  -----------
  Post-merge fixes


  Commit: f72cfdc80487b850c96cc64a8cde892427904f0b
      https://github.com/Evolveum/midpoint/commit/f72cfdc80487b850c96cc64a8cde892427904f0b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java

  Log Message:
  -----------
  Tentatively fix MID-4383: (...) prismContext is null

The problem with MID-4383: "UserProfile Projection tab:
java.lang.IllegalStateException: prismContext is null" is that
prismContext is null in ShadowType->ResourceType (supposedly)
after session objects deserialization. This commit provides
a temporary fix, until session objects are treated in a more
systematic way.


  Commit: 6c0fcabb456b0d4d6bcb3262addca5bf40c311fd
      https://github.com/Evolveum/midpoint/commit/6c0fcabb456b0d4d6bcb3262addca5bf40c311fd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/post-3.7-fixes' into post-3.7-fixes


  Commit: d97228019fd6148bbd4fbe58253e8f719f9937eb
      https://github.com/Evolveum/midpoint/commit/d97228019fd6148bbd4fbe58253e8f719f9937eb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ExecuteChangesTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeModelTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
    A 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
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    A 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/CsvDisablingBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManual.java
    A 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/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A 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/resource-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.xml
    M model/model-intest/testng-integration.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningOperationState.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheFactory.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 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/PropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/pom.xml
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/TaskHandlerUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'feature/manual-improvements' into post-3.7-fixes


  Commit: f2c3c013c890a0f7e5236155fe93e7ebc01d266a
      https://github.com/Evolveum/midpoint/commit/f2c3c013c890a0f7e5236155fe93e7ebc01d266a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

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

  Log Message:
  -----------
  Improve code for relation matching in org queries

This commit contains slight improvement for relation matching in org
queries (MID-4357, MID-4240). The code is unified with relation
matching in ReferenceRestriction, in particular with regard for
backwards compatibility and robustness (dealing with empty relation
value and unqualified values).


  Commit: ee7f3d97cbcdb6fe867e6445172bb6e1d793b439
      https://github.com/Evolveum/midpoint/commit/ee7f3d97cbcdb6fe867e6445172bb6e1d793b439
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

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

  Log Message:
  -----------
  Fix MID-4384: NPE in Shadow Integrity Task detail

Plus cosmetic code changes.


  Commit: deb0e0da15446162b90fc4caa68419bdc51971e0
      https://github.com/Evolveum/midpoint/commit/deb0e0da15446162b90fc4caa68419bdc51971e0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

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

  Log Message:
  -----------
  postgres audit upgrade script tested, fixed


  Commit: 1ed7377e6dbdceccb7c6f7c27ea32344532d6f2b
      https://github.com/Evolveum/midpoint/commit/1ed7377e6dbdceccb7c6f7c27ea32344532d6f2b
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Log Message:
  -----------
  github auth test


  Commit: 5b4e4695158ae1d08b3d38f286b875f95dff9729
      https://github.com/Evolveum/midpoint/commit/5b4e4695158ae1d08b3d38f286b875f95dff9729
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml

  Log Message:
  -----------
  Fix MID-4372: processSpecification vs delete op

ProcessSpecification is used to start separate process(es)
for approving partial operations. But these have no meaning
for delete deltas, so they are now skipped in such cases.


  Commit: 128ce2f8f053ce5d4e28b69ea4cdd239413b180d
      https://github.com/Evolveum/midpoint/commit/128ce2f8f053ce5d4e28b69ea4cdd239413b180d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml
    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/query2/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/ReferenceRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

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


  Commit: ed502a122d9f2d099f78b2184229a0569b66bc03
      https://github.com/Evolveum/midpoint/commit/ed502a122d9f2d099f78b2184229a0569b66bc03
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPath.java
    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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ObjectSecurityConstraintsImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixing authorizations for non-trivial assignments (model)


  Commit: 1f1576c55b3f2a9766cc892880939854fd5094f1
      https://github.com/Evolveum/midpoint/commit/1f1576c55b3f2a9766cc892880939854fd5094f1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  definition processing option


  Commit: feebd983a604b012859dd93893ffbfbb845528ab
      https://github.com/Evolveum/midpoint/commit/feebd983a604b012859dd93893ffbfbb845528ab
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPath.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/AsynchronousOperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckTaskHandler.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/sync/ExecuteChangesTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/TaskHandlerUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeModelTaskHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ReindexTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
    A 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
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/BackingStore.java
    A 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/CsvDisablingBackingStore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManual.java
    A 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/TestSemiManual.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    A 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/security/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml
    A model/model-intest/src/test/resources/manual/task-propagation-semi-manual-grouping.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 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningOperationState.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/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheFactory.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 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/PropagationResultHandler.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/task/PropagationTaskHandler.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/pom.xml
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeResultHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/TaskHandlerUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ObjectSecurityConstraintsImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 96069f515bb73b3a074d4988024ae1df7e4013c4
      https://github.com/Evolveum/midpoint/commit/96069f515bb73b3a074d4988024ae1df7e4013c4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

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

  Log Message:
  -----------
  Localization for ConstructionType (MID-4341)


  Commit: 98da92115e2b80b84af79b3264b357d7dccc0fed
      https://github.com/Evolveum/midpoint/commit/98da92115e2b80b84af79b3264b357d7dccc0fed
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

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

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


  Commit: d939a5369f462f82dd1968ee56943e3ecca10222
      https://github.com/Evolveum/midpoint/commit/d939a5369f462f82dd1968ee56943e3ecca10222
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.xml

  Log Message:
  -----------
  Improved limoted role admin security test


  Commit: e2abddcacc7ca7600c84015f217f7900daadbe6a
      https://github.com/Evolveum/midpoint/commit/e2abddcacc7ca7600c84015f217f7900daadbe6a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


  Commit: adf65f25b30d1ff3b72ee0aac45a264d37c45350
      https://github.com/Evolveum/midpoint/commit/adf65f25b30d1ff3b72ee0aac45a264d37c45350
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

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

  Log Message:
  -----------
  Add SQLServer upgrade procedure for audit tables

Also formatted sqlserver-3.7-all.sql file.


  Commit: 1c83ab0f9a40fc8698087c4cec75cac90f3faf76
      https://github.com/Evolveum/midpoint/commit/1c83ab0f9a40fc8698087c4cec75cac90f3faf76
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

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

  Log Message:
  -----------
  fixing build


  Commit: ad0e48adcbc5fe9300d5856c1cf1414528522041
      https://github.com/Evolveum/midpoint/commit/ad0e48adcbc5fe9300d5856c1cf1414528522041
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.xml

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


  Commit: 91d57e1c99fc26ccb207501c5ba1f8cbbbcb8d91
      https://github.com/Evolveum/midpoint/commit/91d57e1c99fc26ccb207501c5ba1f8cbbbcb8d91
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPath.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.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
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.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/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml
    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/query2/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/ReferenceRestriction.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/ObjectSecurityConstraintsImpl.java
    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: 350ac11ea1b238c23c94e4fb20a3e4dd68f9cb1e
      https://github.com/Evolveum/midpoint/commit/350ac11ea1b238c23c94e4fb20a3e4dd68f9cb1e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPath.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DefinitionProcessingOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.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
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    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/TestSecurityAdvanced.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/role-limited-role-administrator.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/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
    M model/workflow-impl/src/test/resources/policy/lifecycle/global-policy-rules.xml
    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/query2/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/ReferenceRestriction.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/ObjectSecurityConstraintsImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

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


  Commit: 5d3a2f1f2ea5e0c74d367753433d4612bc0157ce
      https://github.com/Evolveum/midpoint/commit/5d3a2f1f2ea5e0c74d367753433d4612bc0157ce
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M model/report-impl/src/test/resources/reports/report-user-list-script.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/commandline/CommandLineScriptExecutor.java

  Log Message:
  -----------
  fixed report file path escaping for postscript processing, fixed tests


  Commit: d5cd5713afcde3cb93de8eb6304437caa166c790
      https://github.com/Evolveum/midpoint/commit/d5cd5713afcde3cb93de8eb6304437caa166c790
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

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

  Log Message:
  -----------
  oracle script fixed (audit changes)


  Commit: c58544c0d92934f7b90649bfe46da8a5e7fad334
      https://github.com/Evolveum/midpoint/commit/c58544c0d92934f7b90649bfe46da8a5e7fad334
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-01-15 (Mon, 15 Jan 2018)

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

  Log Message:
  -----------
  Translation update


Compare: https://github.com/Evolveum/midpoint/compare/5e0c73fba613...c58544c0d929


More information about the midPoint-svn mailing list