From aad64c48132ce20432ccfa96b63b480e7f020713 Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Tue, 13 Mar 2018 16:25:52 +0530
Subject: [PATCH 1/2] resolving issues with consent management

---
 modules/distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++
 pom.xml                      |  4 ++--
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index d8299a59..ee463f34 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -148,6 +148,26 @@
 							</replacements>
 						</configuration>
 					</execution>
+
+					<!-- Replace Consent Mgt Datasource Confgs -->
+					<execution>
+						<id>replace-for-consent</id>
+						<phase>package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+						<configuration>
+							<file>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/consent-mgt-config.xml</file>
+							<replacements>
+								<replacement>
+									<xpath>/ConsentManager/DataSource/Name</xpath>
+									<token>(jdbc/WSO2CarbonDB)</token>
+									<value>jdbc/WSO2AM_DB</value>
+								</replacement>
+							</replacements>
+						</configuration>
+					</execution>
+
 					<!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml -->
 
 					<!-- Replace the Datasource in the thrift-authentication.xml file -->
@@ -450,7 +470,33 @@
 							</tasks>
 						</configuration>
 					</execution>
+					<execution>
+						<!-- Creating API Management schema -->
+						<id>create-user-consent-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create User Consent H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
 
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
 					<execution>
 						<!-- Creating App Management schema -->
 						<id>create-app-mgt-schema</id>
diff --git a/pom.xml b/pom.xml
index 5999bb1d..35366df8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1525,14 +1525,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.3</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.3-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.1.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>

From 7f8d57b7dcdd1af514dd114d7687301b1dab2c8a Mon Sep 17 00:00:00 2001
From: kamidu <sachithsn@gmail.com>
Date: Tue, 13 Mar 2018 18:06:18 +0530
Subject: [PATCH 2/2] Update app mgt version

Update the app mgt version to retrive all the OAEP fixes
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5999bb1d..a13cc369 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1637,7 +1637,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.51</appmgt.feature.version>
+        <appmgt.feature.version>1.2.53</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.5.1</carbon.store.version>