[midPoint-git] [Evolveum/midpoint] c28d59: Lower object count to keep test running time reaso...

[Petr Gašparík]

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: c28d59c5cd52d6d9eb4cb54a3d28a04914702cdf
      https://github.com/Evolveum/midpoint/commit/c28d59c5cd52d6d9eb4cb54a3d28a04914702cdf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-01 (Fri, 01 Dec 2017)

  Changed paths:
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java

  Log Message:
  -----------
  Lower object count to keep test running time reasonable.


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

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java

  Log Message:
  -----------
  Better error message for expired credentials (MID-3746)


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

  Changed paths:
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AlphabeticalMethodInterceptor.java
    A tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/CurrentTestResultHolder.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/TestListener.java

  Log Message:
  -----------
  Fixed failing TestUserTemplate: introducing test-aware configurations


  Commit: 946b0be6115c42239ab766453b1705c1798fa2cf
      https://github.com/Evolveum/midpoint/commit/946b0be6115c42239ab766453b1705c1798fa2cf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-01 (Fri, 01 Dec 2017)

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

  Log Message:
  -----------
  Fixed task manager tests.


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

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java

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


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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

  Log Message:
  -----------
  Tests for old values in audit deltas (MID-4020)


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

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

  Log Message:
  -----------
  MID-4182 localization key resolving fix


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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AlphabeticalMethodInterceptor.java
    A tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/CurrentTestResultHolder.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/TestListener.java

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


  Commit: b276dc1a9a0951e588296a15b9646785434de3ba
      https://github.com/Evolveum/midpoint/commit/b276dc1a9a0951e588296a15b9646785434de3ba
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-02 (Sat, 02 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/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  operation result localization


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

  Changed paths:
    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/LocalizationServiceImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_pl.properties
    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/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ApprovalMetadataHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/resources/common/resource-opendj-complex.xml
    M testing/longtest/src/test/resources/common/resource-opendj-university.xml
    M testing/longtest/src/test/resources/ldap-complex/role-captain.xml
    M testing/longtest/src/test/resources/ldap-complex/role-judge.xml
    M testing/longtest/src/test/resources/ldap-complex/role-pirate.xml
    M testing/longtest/src/test/resources/ldap-complex/role-sailor.xml
    M testing/longtest/src/test/resources/logback-test.xml
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AlphabeticalMethodInterceptor.java
    A tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/CurrentTestResultHolder.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/TestListener.java

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROperationResultStatus.java

  Log Message:
  -----------
  Fixed MID-3903: No filtering for events of unknown outcome


  Commit: 2d7f36b3ed432774d280a4494b01536ba5284e5c
      https://github.com/Evolveum/midpoint/commit/2d7f36b3ed432774d280a4494b01536ba5284e5c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-02 (Sat, 02 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/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/LocalizationServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

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


  Commit: 0b333736ec5342821d1fc30e944319649343efd6
      https://github.com/Evolveum/midpoint/commit/0b333736ec5342821d1fc30e944319649343efd6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-02 (Sat, 02 Dec 2017)

  Changed paths:
    M model/model-impl/src/main/resources/com/evolveum/midpoint/security.properties
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java

  Log Message:
  -----------
  Fixed model-impl tests.


  Commit: 11043a847919496cb0310681108da61b864b3d44
      https://github.com/Evolveum/midpoint/commit/11043a847919496cb0310681108da61b864b3d44
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-12-02 (Sat, 02 Dec 2017)

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

  Log Message:
  -----------
  prepared keys for dashboard


  Commit: e55375cd91c24e12b83d794ea666ba8208fd2ae7
      https://github.com/Evolveum/midpoint/commit/e55375cd91c24e12b83d794ea666ba8208fd2ae7
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-12-02 (Sat, 02 Dec 2017)

  Changed paths:
    M model/model-impl/src/main/resources/com/evolveum/midpoint/security.properties
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java

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


  Commit: d9f443012ee3a0bdef82e8249addb65382fa0198
      https://github.com/Evolveum/midpoint/commit/d9f443012ee3a0bdef82e8249addb65382fa0198
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-12-02 (Sat, 02 Dec 2017)

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

  Log Message:
  -----------
  typo


  Commit: 9913932de761558c436ff931645b37f6e8189d42
      https://github.com/Evolveum/midpoint/commit/9913932de761558c436ff931645b37f6e8189d42
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-03 (Sun, 03 Dec 2017)

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

  Log Message:
  -----------
  MID-4206 fix


  Commit: 87e093c65767dc1eaf439c1bb71ccf93d9bb05af
      https://github.com/Evolveum/midpoint/commit/87e093c65767dc1eaf439c1bb71ccf93d9bb05af
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-03 (Sun, 03 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-impl/src/main/resources/com/evolveum/midpoint/security.properties
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROperationResultStatus.java

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java

  Log Message:
  -----------
  MID-4219 fix + some refactoring


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

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

  Log Message:
  -----------
  properties fix


  Commit: 5acd882e2721a9fa2a2ec1a6cc4b25e9c8613b5c
      https://github.com/Evolveum/midpoint/commit/5acd882e2721a9fa2a2ec1a6cc4b25e9c8613b5c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    M testing/conntest/pom.xml
    M testing/conntest/src/test/resources/ctx-conntest-test-main.xml

  Log Message:
  -----------
  Fixing conntest dependencies


  Commit: 5e521eeba9737aeb27c0aa6d2c35578b88884494
      https://github.com/Evolveum/midpoint/commit/5e521eeba9737aeb27c0aa6d2c35578b88884494
  Author: Kristian <kristian.suchanovsky 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

  Log Message:
  -----------
  springboot scripts start.sh and stop.sh modified


  Commit: 889978b2603bb882835130f40a4b6a2448a3c069
      https://github.com/Evolveum/midpoint/commit/889978b2603bb882835130f40a4b6a2448a3c069
  Author: Kristian <kristian.suchanovsky at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

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

  Log Message:
  -----------
  updated springboot.sh


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

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

  Log Message:
  -----------
  show empty action for header panel


  Commit: cd0fcf68539d98feb36507a7f8e73b452d720d97
      https://github.com/Evolveum/midpoint/commit/cd0fcf68539d98feb36507a7f8e73b452d720d97
  Author: kate <honchar 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 testing/conntest/pom.xml
    M testing/conntest/src/test/resources/ctx-conntest-test-main.xml

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


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

  Changed paths:
    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/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/page/admin/users/PageUsers.java

  Log Message:
  -----------
  Fixing object list buttons styles (MID-4231)


  Commit: ebe8c297567abe84389085ec46eb89d2ec9d535e
      https://github.com/Evolveum/midpoint/commit/ebe8c297567abe84389085ec46eb89d2ec9d535e
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-04 (Mon, 04 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/prism/ContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java

  Log Message:
  -----------
  delete child container fix


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

  Changed paths:
    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/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/page/admin/users/PageUsers.java

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


  Commit: 540324e52f028640e45f57a8ceaaaf8df1f49487
      https://github.com/Evolveum/midpoint/commit/540324e52f028640e45f57a8ceaaaf8df1f49487
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    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/web/page/admin/users/PageUsers.java

  Log Message:
  -----------
  Converting object list buttons to button group (MID-4231)


  Commit: 1f36b5f45f1b8bd7e38aebc54a5661f771ae8e98
      https://github.com/Evolveum/midpoint/commit/1f36b5f45f1b8bd7e38aebc54a5661f771ae8e98
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    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:
  -----------
  fixing inbound processing..


  Commit: ab6575b0b494d5ef9537cbcc9a1c92e288825e2d
      https://github.com/Evolveum/midpoint/commit/ab6575b0b494d5ef9537cbcc9a1c92e288825e2d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

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

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


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

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

  Log Message:
  -----------
  specified AbstractRoleType type for targetRef attribute of ExclusionPolicyConstraintType object


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

  Changed paths:
    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/web/page/admin/users/PageUsers.java
    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 branch 'master' of https://github.com/Evolveum/midpoint


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

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Fixing WSS4J version


  Commit: 592f692a9bf098420440911cd3fce9041f2141d7
      https://github.com/Evolveum/midpoint/commit/592f692a9bf098420440911cd3fce9041f2141d7
  Author: Kristian <kristian.suchanovsky at evolveum.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

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

  Log Message:
  -----------
  added nohup for springboot.sh


  Commit: 54bbda72f6bee57b3f0f73ad204b67dcf3200b02
      https://github.com/Evolveum/midpoint/commit/54bbda72f6bee57b3f0f73ad204b67dcf3200b02
  Author: kate <honchar at evolveum.com>
  Date:   2017-12-04 (Mon, 04 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:
  -----------
  MID-4271 fix


  Commit: 7e56097089666e3f7b8291ff6f58fc6339ce362a
      https://github.com/Evolveum/midpoint/commit/7e56097089666e3f7b8291ff6f58fc6339ce362a
  Author: kate <honchar 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

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


  Commit: 5737bd52901f674b28fdfa7687b52185a177a64e
      https://github.com/Evolveum/midpoint/commit/5737bd52901f674b28fdfa7687b52185a177a64e
  Author: Pavol Mederly <mederly 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 infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
    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/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 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/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-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

  Log Message:
  -----------
  MID-4210: Localization of value policy checking messages


  Commit: 92c415a2cabde780344d7d33718b7088bb43dfce
      https://github.com/Evolveum/midpoint/commit/92c415a2cabde780344d7d33718b7088bb43dfce
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    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/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/resources/common/xml/ns/wf-context.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java

  Log Message:
  -----------
  Parsing abstractly typed fields (like LocalizableMessageType) without the need for xsi:type


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

  Changed paths:
    M build-system/pom.xml
    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/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/assignment/AbstractRoleAssignmentPanel.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/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 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
    M testing/conntest/pom.xml
    M testing/conntest/src/test/resources/ctx-conntest-test-main.xml

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


  Commit: 61a9d65a6722c7b8845c3b686a99111c2456e858
      https://github.com/Evolveum/midpoint/commit/61a9d65a6722c7b8845c3b686a99111c2456e858
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageListBuilder.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 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/ValuePolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java

  Log Message:
  -----------
  Removed (now unnecessary) support for multiple localizable messages in exceptions.


  Commit: 489dc9b10a92e4f16cd0e073e6e87aad6acf6b39
      https://github.com/Evolveum/midpoint/commit/489dc9b10a92e4f16cd0e073e6e87aad6acf6b39
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  Compilation fix.


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

  Changed paths:
    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/prism/ContainerValueWrapper.java

  Log Message:
  -----------
  MID-4195 fix


  Commit: 93c0913409bec00aaa00b2f724fba1c8f13e6dd2
      https://github.com/Evolveum/midpoint/commit/93c0913409bec00aaa00b2f724fba1c8f13e6dd2
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java

  Log Message:
  -----------
  fixing MID-3634


  Commit: 8ea8548a284aa6d8b63197f16eacc17355b6ab55
      https://github.com/Evolveum/midpoint/commit/8ea8548a284aa6d8b63197f16eacc17355b6ab55
  Author: kate <honchar 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 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/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/test/resources/common/xml/ns/wf-context.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 model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    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

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


  Commit: 94a26768edd30e4ecc4002b9c3f76fca2ee1208e
      https://github.com/Evolveum/midpoint/commit/94a26768edd30e4ecc4002b9c3f76fca2ee1208e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M infra/util/pom.xml

  Log Message:
  -----------
  Fixing dependencies


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

  Changed paths:
    M infra/util/pom.xml
    M model/model-common/pom.xml

  Log Message:
  -----------
  Fixed dependencies.


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

  Changed paths:
    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/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
    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/postgresql/postgresql-3.6.sql
    R config/sql/midpoint/3.6/postgresql/postgresql-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/postgresql/postgresql-3.7.sql
    M config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql

  Log Message:
  -----------
  Updated db scripts for H2 and PostgreSQL.


  Commit: 03f44070a4851d39a12e4ae86b3a60ba26ec0a84
      https://github.com/Evolveum/midpoint/commit/03f44070a4851d39a12e4ae86b3a60ba26ec0a84
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    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/prism/ContainerValueWrapper.java

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


  Commit: 24039dc28d204fb355a3e0556ee0ef1935c9e62b
      https://github.com/Evolveum/midpoint/commit/24039dc28d204fb355a3e0556ee0ef1935c9e62b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd

  Log Message:
  -----------
  fixing MID-4259


  Commit: 28990e702567ba27ab4c116c96ebb118b4eb0749
      https://github.com/Evolveum/midpoint/commit/28990e702567ba27ab4c116c96ebb118b4eb0749
  Author: Katarina Valalikova <k.valalikova 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/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
    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/postgresql/postgresql-3.6.sql
    R config/sql/midpoint/3.6/postgresql/postgresql-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/postgresql/postgresql-3.7.sql
    M config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql
    M dist/src/main/bin/springboot.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/AbstractRoleAssignmentPanel.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/prism/ContainerValueWrapper.java
    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/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 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

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

Conflicts:
	infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd


  Commit: 373c1624a2d28efdf61a874886443a68858df2c7
      https://github.com/Evolveum/midpoint/commit/373c1624a2d28efdf61a874886443a68858df2c7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    R config/sql/_all/mysql-upgrade-3.5-3.6.sql
    R config/sql/_all/oracle-upgrade-3.5-3.6.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.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/sqlserver/sqlserver-3.7.sql
    M config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql

  Log Message:
  -----------
  Updated db scripts for SQL server.


  Commit: 48c839d6fb827bcc88c95a9c72afd6a3da1d9540
      https://github.com/Evolveum/midpoint/commit/48c839d6fb827bcc88c95a9c72afd6a3da1d9540
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M dist/src/main/bin/springboot.sh
    M dist/src/main/bin/start.sh
    M dist/src/main/bin/stop.sh

  Log Message:
  -----------
  Copyright headers


  Commit: 1dcd318324f1e9411ca03b9be755174be3a76147
      https://github.com/Evolveum/midpoint/commit/1dcd318324f1e9411ca03b9be755174be3a76147
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M config/sql/_all/oracle-3.7-all.sql
    M config/sql/_all/oracle-upgrade-3.6-3.7.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
    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

  Log Message:
  -----------
  Updated db scripts for Oracle.


  Commit: 7a35adc3d444c45f996ac2f50f04afae41079fce
      https://github.com/Evolveum/midpoint/commit/7a35adc3d444c45f996ac2f50f04afae41079fce
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M config/sql/_all/mysql-3.7-all.sql
    M config/sql/_all/mysql-upgrade-3.6-3.7.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
    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

  Log Message:
  -----------
  Updated db scripts for MySQL.


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

  Changed paths:
    M testing/longtest/pom.xml

  Log Message:
  -----------
  Fixing dependencies


  Commit: 36ceb912b7a4ac73ab1f77dbcba68f242a7f951b
      https://github.com/Evolveum/midpoint/commit/36ceb912b7a4ac73ab1f77dbcba68f242a7f951b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    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/web/component/prism/ContainerWrapperFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    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'


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

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

  Log Message:
  -----------
  Forgotten quartz db scripts.


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

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

  Log Message:
  -----------
  Cleaning up script output, support for MIDPOINT_HOME env


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

  Changed paths:
    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/RoleMemberPanel.html
    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/AbstractRoleMemberPanel.java

  Log Message:
  -----------
  supported types for members panel


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

  Changed paths:
    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/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.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/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/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/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/web/component/prism/ContainerWrapperFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M testing/longtest/pom.xml

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


  Commit: c2df3d02eb949bf71916a0abd9a5a0d1a1d7d731
      https://github.com/Evolveum/midpoint/commit/c2df3d02eb949bf71916a0abd9a5a0d1a1d7d731
  Author: Kristian <kristian.suchanovsky at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  defined keystore and truststore


  Commit: 4f6839cac89345b933823850c6879de56351838b
      https://github.com/Evolveum/midpoint/commit/4f6839cac89345b933823850c6879de56351838b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 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/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
    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/localization/Midpoint.properties

  Log Message:
  -----------
  fixign MID-4302


  Commit: 86eb2a88f6bb80cd5725cffe5a54636d1640ae3a
      https://github.com/Evolveum/midpoint/commit/86eb2a88f6bb80cd5725cffe5a54636d1640ae3a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  removing unused files


  Commit: 8b06ce3c0a8710d10b7f1361a928c1a726116328
      https://github.com/Evolveum/midpoint/commit/8b06ce3c0a8710d10b7f1361a928c1a726116328
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    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/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.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/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/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/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/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/RoleMemberPanel.html
    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/AbstractRoleMemberPanel.java
    M testing/longtest/pom.xml

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


  Commit: 73e6ff5d67ef6c1d91941a56f440b5d8ca22a0a4
      https://github.com/Evolveum/midpoint/commit/73e6ff5d67ef6c1d91941a56f440b5d8ca22a0a4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    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/page/admin/roles/RoleRelationSelectionPanel.java

  Log Message:
  -----------
  adding missing licence headers


  Commit: 5b454c3a85ce7f411d3ab94667c7b17dadfbf9ae
      https://github.com/Evolveum/midpoint/commit/5b454c3a85ce7f411d3ab94667c7b17dadfbf9ae
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/logback.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/ProfilingLogbackFilter.java

  Log Message:
  -----------
  Changed idm.log -> midpoint.log


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

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Bumped wicket version, fixes session storage cleanup problems


  Commit: b16e7fd4a25a0bd7d10ae14dc579c3d26325df0a
      https://github.com/Evolveum/midpoint/commit/b16e7fd4a25a0bd7d10ae14dc579c3d26325df0a
  Author: Kristian <kristian.suchanovsky at evolveum.com>
  Date:   2017-12-05 (Tue, 05 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

  Log Message:
  -----------
  Updated springboot start, stop scripts for windows


  Commit: 29ff85b6e5029cad30ab250002e3ac5b25b98806
      https://github.com/Evolveum/midpoint/commit/29ff85b6e5029cad30ab250002e3ac5b25b98806
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  Implemented MID-4299: cert campaigns cleanup policy


  Commit: 22a4b38508223ede4292beae4bd05f559443d221
      https://github.com/Evolveum/midpoint/commit/22a4b38508223ede4292beae4bd05f559443d221
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M build-system/pom.xml
    A dist/src/main/bin/springboot.bat
    M dist/src/main/bin/springboot.sh
    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/component/dialog/Popupable.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/ProfilingConfigurationManager.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/ProfilingLogbackFilter.java

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


  Commit: 588d792f4f1daf3e9af4dbb9dc710694b0fb6c7b
      https://github.com/Evolveum/midpoint/commit/588d792f4f1daf3e9af4dbb9dc710694b0fb6c7b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Adapted TestPolicyRules2.


  Commit: 9d20314a7f77fbb207e0cbb2a7318717f85498fe
      https://github.com/Evolveum/midpoint/commit/9d20314a7f77fbb207e0cbb2a7318717f85498fe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M model/certification-api/pom.xml

  Log Message:
  -----------
  Another missing dependency.


  Commit: b8b8845a0465e6eab1da722dd1308a59caeaeee8
      https://github.com/Evolveum/midpoint/commit/b8b8845a0465e6eab1da722dd1308a59caeaeee8
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  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:
  -----------
  Policy strings trnslation


Compare: https://github.com/Evolveum/midpoint/compare/b9fff0651760...b8b8845a0465