Merge pull request #742 from pulasthi7/test-fix

Fixing tests and updating the component versions
wso2 · Oct 9, 2016 · af9f2d0 · af9f2d0
2 parents 8d4ce65 + 9ddcf21
commit af9f2d0
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 5 deletions.
diff --git a/...ts-backend/src/test/resources/artifacts/IS/analytics/config/identit_analytics_enabled.xml b/...ts-backend/src/test/resources/artifacts/IS/analytics/config/identit_analytics_enabled.xml
@@ -387,6 +387,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <SelfRegistration>

diff --git a/...ation/tests-backend/src/test/resources/artifacts/IS/analytics/config/identit_original.xml b/...ation/tests-backend/src/test/resources/artifacts/IS/analytics/config/identit_original.xml
@@ -387,6 +387,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <SelfRegistration>

diff --git a/...ests-backend/src/test/resources/artifacts/IS/identityMgt/identity-accountlock-enabled.xml b/...ests-backend/src/test/resources/artifacts/IS/identityMgt/identity-accountlock-enabled.xml
@@ -365,6 +365,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <EmailVerification>

diff --git a/...kend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml b/...kend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml
@@ -433,6 +433,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <EmailVerification>

diff --git a/...kend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml b/...kend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml
@@ -269,6 +269,11 @@
 		</Question>
 		<ExpiryTime>3</ExpiryTime>
 		<NotifySuccess>true</NotifySuccess>
+		<AdminPasswordReset>
+			<Offline>false</Offline>
+			<OTP>false</OTP>
+			<RecoveryLink>true</RecoveryLink>
+		</AdminPasswordReset>
 	</Recovery>
 
 	<EmailVerification>

diff --git a/...sts-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-default.xml b/...sts-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-default.xml
@@ -269,6 +269,11 @@
 		</Question>
 		<ExpiryTime>3</ExpiryTime>
 		<NotifySuccess>true</NotifySuccess>
+		<AdminPasswordReset>
+			<Offline>false</Offline>
+			<OTP>false</OTP>
+			<RecoveryLink>true</RecoveryLink>
+		</AdminPasswordReset>
 	</Recovery>
 
 	<EmailVerification>

diff --git a/...gration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml b/...gration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml
@@ -269,6 +269,11 @@
 		</Question>
 		<ExpiryTime>3</ExpiryTime>
 		<NotifySuccess>true</NotifySuccess>
+		<AdminPasswordReset>
+			<Offline>false</Offline>
+			<OTP>false</OTP>
+			<RecoveryLink>true</RecoveryLink>
+		</AdminPasswordReset>
 	</Recovery>
 
 	<EmailVerification>

diff --git a/...ation/tests-backend/src/test/resources/artifacts/IS/provisioning/identity-dbseperated.xml b/...ation/tests-backend/src/test/resources/artifacts/IS/provisioning/identity-dbseperated.xml
@@ -360,6 +360,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <EmailVerification>

diff --git a/...tegration/tests-backend/src/test/resources/artifacts/IS/provisioning/identity-default.xml b/...tegration/tests-backend/src/test/resources/artifacts/IS/provisioning/identity-default.xml
@@ -382,6 +382,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <EmailVerification>

diff --git a/...tion/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml b/...tion/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml
@@ -433,6 +433,11 @@
         </Question>
         <ExpiryTime>3</ExpiryTime>
         <NotifySuccess>true</NotifySuccess>
+        <AdminPasswordReset>
+            <Offline>false</Offline>
+            <OTP>false</OTP>
+            <RecoveryLink>true</RecoveryLink>
+        </AdminPasswordReset>
     </Recovery>
 
     <EmailVerification>

diff --git a/pom.xml b/pom.xml
@@ -1203,16 +1203,16 @@
         <product.identity.version>5.3.0-SNAPSHOT</product.identity.version>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.5.1</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.5.5</carbon.identity.framework.version>
 
         <!--Identity Repo Versions-->
         <identity.local.auth.basicauth.version>5.2.0</identity.local.auth.basicauth.version>
         <identity.carbon.auth.saml2.version>5.1.5</identity.carbon.auth.saml2.version>
         <identity.inbound.auth.saml.version>5.1.3</identity.inbound.auth.saml.version>
-        <identity.inbound.auth.oauth.version>5.2.1</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>5.2.2</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.openid.version>5.2.0</identity.inbound.auth.openid.version>
         <identity.agent.sso.version>5.1.3</identity.agent.sso.version>
-        <identity.inbound.auth.sts.version>5.1.4</identity.inbound.auth.sts.version>
+        <identity.inbound.auth.sts.version>5.1.5</identity.inbound.auth.sts.version>
         <identity.local.auth.fido.version>5.1.3</identity.local.auth.fido.version>
         <identity.outbound.auth.requestpath.basicauth.version>5.1.3</identity.outbound.auth.requestpath.basicauth.version>
         <identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version>
@@ -1238,10 +1238,10 @@
         <identity.data.publisher.oauth.version>0.1.1</identity.data.publisher.oauth.version>
         <!--<identity.carbon.auth.thrift.version>5.5.0-SNAPSHOT</identity.carbon.auth.thrift.version>-->
         <!--<identity.application.auth.oidc.version>5.1.2-SNAPSHOT</identity.application.auth.oidc.version>-->
-        <identity.governance.version>0.1.1</identity.governance.version>
+        <identity.governance.version>0.1.5</identity.governance.version>
         <org.wso2.carbon.identity.auth.version>0.1.0</org.wso2.carbon.identity.auth.version>
         <identity.event.handler.account.lock.version>1.0.0</identity.event.handler.account.lock.version>
-        <identity.event.handler.notification.version>0.1.0</identity.event.handler.notification.version>
+        <identity.event.handler.notification.version>0.1.3</identity.event.handler.notification.version>
         <!--<identity.agent.entitlement.proxy.version>5.1.1</identity.agent.entitlement.proxy.version>-->
         <!--<identity.carbon.auth.signedjwt.version>5.1.1</identity.carbon.auth.signedjwt.version>-->
         <!--<identity.userstore.cassandra.version>5.1.1</identity.userstore.cassandra.version>-->