Resolved conflicts

wso2 · Aug 22, 2017 · 0966b03 · 0966b03
2 parents 6db4dc9 + 2d3a58f
commit 0966b03
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1513,7 +1513,7 @@
 
         <!--Identity Repo Versions-->
         <identity.carbon.auth.saml2.version>5.2.3</identity.carbon.auth.saml2.version>
-        <identity.inbound.auth.saml.version>5.3.6</identity.inbound.auth.saml.version>
+        <identity.inbound.auth.saml.version>5.3.7</identity.inbound.auth.saml.version>
         <identity.inbound.auth.oauth.version>5.4.40</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.openid.version>5.2.2</identity.inbound.auth.openid.version>
         <identity.agent.sso.version>5.1.11</identity.agent.sso.version>
@@ -1571,7 +1571,7 @@
         <identity.local.auth.iwa.version>5.3.2</identity.local.auth.iwa.version>
 
         <!-- OAuth2 Grant Type extensions -->
-        <identity.oauth2.jwt.bearer.grant.version>1.0.6</identity.oauth2.jwt.bearer.grant.version>
+        <identity.oauth2.jwt.bearer.grant.version>1.0.7</identity.oauth2.jwt.bearer.grant.version>
 
         <!--SAML Metadata-->
         <identity.metadata.saml.version>1.0.2</identity.metadata.saml.version>
@@ -1649,7 +1649,7 @@
         <operadriver.version>0.8.1</operadriver.version>
         <selenium.version>2.40.0</selenium.version>
         <testng.version>6.1.1</testng.version>
-        <carbon.deployment.version>4.7.0</carbon.deployment.version>
+        <carbon.deployment.version>4.7.3</carbon.deployment.version>
         <carbon.registry.version>4.6.9</carbon.registry.version>
         <carbon.multitenancy.version>4.6.4</carbon.multitenancy.version>
         <jaggery.extensions.version>1.5.5</jaggery.extensions.version>