[midPoint-git] [Evolveum/midpoint] 855914: fixed ucf module tests

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 855914f990ad2815bd39a32c5b95ee3a852c872b
      https://github.com/Evolveum/midpoint/commit/855914f990ad2815bd39a32c5b95ee3a852c872b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

  Log Message:
  -----------
  fixed ucf module tests


  Commit: e11793b0ca57d47253273d166825abfa7b218182
      https://github.com/Evolveum/midpoint/commit/e11793b0ca57d47253273d166825abfa7b218182
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M model/model-intest/src/test/resources/notifications/system-configuration.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

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

# Conflicts:
#	provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java


Compare: https://github.com/Evolveum/midpoint/compare/23d4d58867fe...e11793b0ca57