Update userstore manager (#7157)

wso2 · Dec 20, 2019 · e0c67d6 · e0c67d6
1 parent b527968
commit e0c67d6
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 25 deletions.
diff --git a/...ion/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml b/...ion/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...nd/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml b/...nd/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ion/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml b/...ion/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
@@ -10,7 +10,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ntegration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml b/...ntegration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml b/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml b/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...n/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml b/...n/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/.../src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml b/.../src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml b/...tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...gration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml b/...gration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml b/...ests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...tion/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/...tion/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml b/...-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml b/...backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ts-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml b/...ts-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...sts-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml b/...sts-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...ntegration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml b/...ntegration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...tion/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml b/...tion/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
@@ -21,7 +21,7 @@ username = "$env{SHARED_DATABASE_USERNAME}"
 password = "$env{SHARED_DATABASE_PASSWORD}"
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml b/...tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_write_ldap"
+type = "read_write_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/...tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml b/...tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
@@ -9,7 +9,7 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "read_only_ldap"
+type = "read_only_ldap_unique_id"
 connection_url = "ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}"
 connection_name = "uid=admin,ou=system"
 connection_password = "admin"

diff --git a/pom.xml b/pom.xml
@@ -1928,7 +1928,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.15.62</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.16.4</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -1939,7 +1939,7 @@
         <carbon.consent.mgt.version>2.2.6</carbon.consent.mgt.version>
 
         <!--Identity Governance Version-->
-        <identity.governance.version>1.3.36</identity.governance.version>
+        <identity.governance.version>1.3.37</identity.governance.version>
 
         <!--Identity Carbon Versions-->
         <identity.carbon.auth.saml2.version>5.4.5</identity.carbon.auth.saml2.version>
@@ -1950,11 +1950,11 @@
 
         <!-- Identity Inbound Versions   -->
         <identity.inbound.auth.saml.version>5.7.10</identity.inbound.auth.saml.version>
-        <identity.inbound.auth.oauth.version>6.2.88</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>6.2.93</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.openid.version>5.4.5</identity.inbound.auth.openid.version>
         <identity.inbound.auth.sts.version>5.4.5</identity.inbound.auth.sts.version>
         <identity.inbound.provisioning.scim.version>5.5.5</identity.inbound.provisioning.scim.version>
-        <identity.inbound.provisioning.scim2.version>1.4.23</identity.inbound.provisioning.scim2.version>
+        <identity.inbound.provisioning.scim2.version>1.4.25</identity.inbound.provisioning.scim2.version>
 
         <!-- Identity workflow Versions -->
         <identity.user.workflow.version>5.3.4</identity.user.workflow.version>
@@ -2032,7 +2032,7 @@
 
         <identity.agent.sso.version>5.3.4</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.3.4</identity.tool.samlsso.validator.version>
-        <identity.app.authz.xacml.version>2.1.4</identity.app.authz.xacml.version>
+        <identity.app.authz.xacml.version>2.1.5</identity.app.authz.xacml.version>
         <identity.oauth2.validators.xacml.version>2.2.2</identity.oauth2.validators.xacml.version>
         <org.wso2.carbon.extension.identity.x509certificate.version>1.0.6</org.wso2.carbon.extension.identity.x509certificate.version>
         <conditional.authentication.functions.version>0.1.40</conditional.authentication.functions.version>