diff --git a/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml b/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml index b542637169..3a16cb1e6e 100644 --- a/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml +++ b/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml @@ -20,7 +20,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.user.governance/pom.xml b/components/org.wso2.carbon.identity.api.user.governance/pom.xml index e77e1d3c2d..d9248589b3 100644 --- a/components/org.wso2.carbon.identity.api.user.governance/pom.xml +++ b/components/org.wso2.carbon.identity.api.user.governance/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../.. org.wso2.carbon.identity.api.user.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT jar WSO2 Carbon - User Rest Governance API WSO2 Carbon - User Rest Governance API diff --git a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml index ce16158be1..c97be66b21 100644 --- a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml +++ b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../.. org.wso2.carbon.identity.api.user.recovery - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT jar WSO2 Carbon - Identity Management Recovery Rest API WSO2 Carbon - Identity Management Recovery Rest API diff --git a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml index 84d63bbd2d..b7526ba9d5 100644 --- a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml +++ b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.captcha/pom.xml b/components/org.wso2.carbon.identity.captcha/pom.xml index 7ea804b0d7..42c20cf05a 100644 --- a/components/org.wso2.carbon.identity.captcha/pom.xml +++ b/components/org.wso2.carbon.identity.captcha/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.governance/pom.xml b/components/org.wso2.carbon.identity.governance/pom.xml index 9eb3124f53..547419f4f2 100644 --- a/components/org.wso2.carbon.identity.governance/pom.xml +++ b/components/org.wso2.carbon.identity.governance/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/model/NotificationTemplate.java b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/model/NotificationTemplate.java index c05144cfa5..f599161c13 100644 --- a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/model/NotificationTemplate.java +++ b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/model/NotificationTemplate.java @@ -15,6 +15,8 @@ */ package org.wso2.carbon.identity.governance.model; +import java.util.Objects; + /** * Object which encapsulates notification template properties. */ @@ -188,4 +190,23 @@ public void setBody(String body) { this.body = body; } + + @Override + public boolean equals(Object o) { + + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + NotificationTemplate that = (NotificationTemplate) o; + return Objects.equals(type, that.type) && Objects.equals(displayName, that.displayName) && + Objects.equals(locale, that.locale) && Objects.equals(body, that.body) && + Objects.equals(contentType, that.contentType) && + Objects.equals(notificationChannel, that.notificationChannel) && + Objects.equals(subject, that.subject) && Objects.equals(footer, that.footer); + } + + @Override + public int hashCode() { + + return Objects.hash(type, displayName, locale, body, contentType, notificationChannel, subject, footer); + } } diff --git a/components/org.wso2.carbon.identity.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.idle.account.identification/pom.xml index 2614533d3b..cce8abb552 100644 --- a/components/org.wso2.carbon.identity.idle.account.identification/pom.xml +++ b/components/org.wso2.carbon.identity.idle.account.identification/pom.xml @@ -18,7 +18,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml index 19f8d3de86..2cef347e1d 100644 --- a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml +++ b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml @@ -21,7 +21,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml index 373972b0fe..c8906d0819 100644 --- a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml +++ b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml @@ -21,7 +21,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml index 82635d0e16..4fa6eff116 100644 --- a/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml +++ b/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml @@ -21,7 +21,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.password.expiry/pom.xml b/components/org.wso2.carbon.identity.password.expiry/pom.xml index 95fb816337..d719e47e40 100644 --- a/components/org.wso2.carbon.identity.password.expiry/pom.xml +++ b/components/org.wso2.carbon.identity.password.expiry/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.password.history/pom.xml b/components/org.wso2.carbon.identity.password.history/pom.xml index 12a205ee13..a32332abaa 100644 --- a/components/org.wso2.carbon.identity.password.history/pom.xml +++ b/components/org.wso2.carbon.identity.password.history/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.password.policy/pom.xml b/components/org.wso2.carbon.identity.password.policy/pom.xml index b60941520a..02e38b8c95 100644 --- a/components/org.wso2.carbon.identity.password.policy/pom.xml +++ b/components/org.wso2.carbon.identity.password.policy/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.piicontroller/pom.xml b/components/org.wso2.carbon.identity.piicontroller/pom.xml index d5efd13f73..b57389692a 100644 --- a/components/org.wso2.carbon.identity.piicontroller/pom.xml +++ b/components/org.wso2.carbon.identity.piicontroller/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml b/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml index 27f8b3e526..180bb2a6f0 100644 --- a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml @@ -5,7 +5,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.recovery/pom.xml b/components/org.wso2.carbon.identity.recovery/pom.xml index 193218d796..5acacfc9f8 100644 --- a/components/org.wso2.carbon.identity.recovery/pom.xml +++ b/components/org.wso2.carbon.identity.recovery/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml @@ -128,6 +128,10 @@ org.wso2.carbon.identity.framework org.wso2.carbon.identity.input.validation.mgt + + org.wso2.carbon.identity.governance + org.wso2.carbon.identity.multi.attribute.login.service + @@ -182,6 +186,8 @@ org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}", org.wso2.carbon.identity.multi.attribute.login.mgt.*; version="${carbon.identity.framework.imp.pkg.version.range}", + org.wso2.carbon.identity.multi.attribute.login.service; + version="${identity.governance.imp.pkg.version.range}", * diff --git a/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml b/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml index 4a498e4d03..a7a75a8cf8 100644 --- a/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml +++ b/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml @@ -22,7 +22,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.user.endpoint/pom.xml b/components/org.wso2.carbon.identity.user.endpoint/pom.xml index 89f4c090af..5b447a8261 100644 --- a/components/org.wso2.carbon.identity.user.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.user.endpoint/pom.xml @@ -5,7 +5,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.user.export.core/pom.xml b/components/org.wso2.carbon.identity.user.export.core/pom.xml index 456941a4b9..5ee2ab4285 100644 --- a/components/org.wso2.carbon.identity.user.export.core/pom.xml +++ b/components/org.wso2.carbon.identity.user.export.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml b/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml index 0376ef11a4..f1a108f676 100644 --- a/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml +++ b/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.user.rename.core/pom.xml b/components/org.wso2.carbon.identity.user.rename.core/pom.xml index 32424e9f8b..aa4298e66a 100644 --- a/components/org.wso2.carbon.identity.user.rename.core/pom.xml +++ b/components/org.wso2.carbon.identity.user.rename.core/pom.xml @@ -20,7 +20,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml b/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml index 5d171b3629..ba86c45617 100644 --- a/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml b/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml index a901bd687d..40bbbe1b52 100644 --- a/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml b/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml index 1ccfcfa71e..17b6962e86 100644 --- a/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.governance.feature/pom.xml b/features/org.wso2.carbon.identity.governance.feature/pom.xml index 906634ff20..43f97e249f 100644 --- a/features/org.wso2.carbon.identity.governance.feature/pom.xml +++ b/features/org.wso2.carbon.identity.governance.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/features/org.wso2.carbon.identity.governance.server.feature/pom.xml b/features/org.wso2.carbon.identity.governance.server.feature/pom.xml index 0c5f318668..b5e65b1c3f 100644 --- a/features/org.wso2.carbon.identity.governance.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.governance.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml b/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml index 2538e23e70..5251fb2d65 100644 --- a/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml b/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml index 245dd9d85f..f09f55c38c 100644 --- a/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml @@ -3,7 +3,7 @@ identity-governance org.wso2.carbon.identity.governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml index c142d02a6e..7948ba2afd 100644 --- a/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml index 0c63897a80..dc1b4bf3c1 100644 --- a/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml index 46e2061526..301b4dd92a 100644 --- a/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml b/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml index d6735a602c..9b03f296c4 100644 --- a/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml b/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml index b84276a98e..a5f1c9656d 100644 --- a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml b/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml index 6f622dc19b..f37d0878e2 100644 --- a/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml +++ b/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml b/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml index c78186ac8d..7fa7e3fea0 100644 --- a/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml +++ b/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT ../../pom.xml diff --git a/features/org.wso2.carbon.identity.user.server.feature/pom.xml b/features/org.wso2.carbon.identity.user.server.feature/pom.xml index 1fcb9a6ba1..ec9dc84904 100644 --- a/features/org.wso2.carbon.identity.user.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.user.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.governance identity-governance ../../pom.xml - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 4576e10e91..2fa1ee5429 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.governance identity-governance - 1.9.11-SNAPSHOT + 1.9.12-SNAPSHOT 4.0.0 pom WSO2 Carbon - Governance Module