[midPoint-git] [Evolveum/midpoint] 973b81: Removing duplicate woodstox

Viliam Repan vilo.repan at evolveum.com
Thu Jan 4 12:03:52 CET 2018


  Branch: refs/heads/feature/hibernate5
  Home:   https://github.com/Evolveum/midpoint
  Commit: 973b81583c4653ef68d92bd5572e0373127a6824
      https://github.com/Evolveum/midpoint/commit/973b81583c4653ef68d92bd5572e0373127a6824
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-18 (Mon, 18 Dec 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Removing duplicate woodstox


  Commit: 5e0c73fba6136b92e860787e5fbfb1de21fc9a79
      https://github.com/Evolveum/midpoint/commit/5e0c73fba6136b92e860787e5fbfb1de21fc9a79
  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


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


Compare: https://github.com/Evolveum/midpoint/compare/bbd641a14c95...228fe999f323


More information about the midPoint-svn mailing list