From f6507d1ed6a883cf0c7c186cb85b1fde360b7fbd Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Mon, 15 May 2017 22:24:18 +0530
Subject: [PATCH 1/2] Fixing issues in publisher UI and SSO login

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 381d410a..5d2cbd21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1485,7 +1485,7 @@
         <!-- Carbon Identity -->
         <carbon.identity.framework.version>5.7.5</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
-        <identity.local.auth.basicauth.version>5.2.4</identity.local.auth.basicauth.version>
+        <identity.local.auth.basicauth.version>5.3.1</identity.local.auth.basicauth.version>
         <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
         <identity.inbound.auth.saml.version>5.3.1</identity.inbound.auth.saml.version>
         <identity.carbon.auth.saml2.version>5.2.1</identity.carbon.auth.saml2.version>
@@ -1628,7 +1628,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.24</appmgt.feature.version>
+        <appmgt.feature.version>1.2.25</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>

From 79a4f589295d3311d6ddb94007ebcd733aa36817 Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Tue, 16 May 2017 09:06:27 +0530
Subject: [PATCH 2/2] Fixing issue in tenant-conf.json copying location

---
 modules/distribution/src/assembly/bin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 50fd397b..de2e6c67 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1343,7 +1343,7 @@
         </file>
 		<file>
 			<source>src/core/resources/tenant/tenant-conf.json</source>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/tenant</outputDirectory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/</outputDirectory>
 			<filtered>true</filtered>
 			<fileMode>644</fileMode>
 		</file>