From be16e40a5cdbf6801169c32177ed7e785ffe396e Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Mon, 12 Mar 2018 11:06:40 +0530
Subject: [PATCH 01/11] Update component versions

Updating the component versions and fixing bugs
---
 modules/distribution/src/assembly/bin.xml     |  19 ++-
 .../analytics-profile/carbon.product          |   4 +-
 modules/p2-profile/analytics-profile/pom.xml  |  25 +++
 .../p2-profile/broker-profile/carbon.product  |   4 +-
 .../iot-core-profile/carbon.product           |   4 +-
 modules/p2-profile/iot-core-profile/pom.xml   | 142 ++++++++++++++++--
 pom.xml                                       |  69 +++++----
 7 files changed, 212 insertions(+), 55 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 15d97bf8..c37a322e 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1291,6 +1291,11 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/balana-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/conf/security/</outputDirectory>
+        </file>
+
         <file>
             <source>src/core/LICENSE.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -1549,13 +1554,13 @@
             <fileMode>755</fileMode>
         </file>
 
-        <file>
-            <source>target/webapp-temp/client-registration#v0.11.war</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
+        <!--<file>-->
+            <!--<source>target/webapp-temp/client-registration#v0.11.war</source>-->
+            <!--<outputDirectory>-->
+                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
+            <!--</outputDirectory>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</file>-->
         <file>
             <source>target/webapp-temp/api#identity#entitlement.war</source>
             <outputDirectory>
diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product
index cf9cca05..4398635b 100644
--- a/modules/p2-profile/analytics-profile/carbon.product
+++ b/modules/p2-profile/analytics-profile/carbon.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.24" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 218493db..30283c1f 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -185,6 +185,7 @@
                                 </featureArtifactDef>
                                 <!-- ************** END - User Management ********* -->
 
+
                                 <!-- ************** START - Deployment Synchronizer ********* -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
@@ -276,6 +277,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.data:org.wso2.carbon.datasource.reader.cassandra.server.feature:${carbon.data.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.data:org.wso2.carbon.datasource.reader.mongo.server.feature:${carbon.data.version}
+                                </featureArtifactDef>
                                 <!-- END - Data source related -->
 
                                 <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
@@ -294,6 +298,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.server.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
@@ -588,6 +595,17 @@
                                 </feature>
                                 <!-- ************** END - User Management ********* -->
 
+                                <!--Identity governance-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--Identity governance ends-->
+
                                 <!-- ************** START - Deployment Synchronizer ********* -->
                                 <feature>
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
@@ -699,6 +717,13 @@
                                     <id>org.wso2.carbon.datasource.reader.cassandra.server.feature.group</id>
                                     <version>${carbon.data.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.datasource.reader.mongo.server.feature.group</id>
+                                    <version>${carbon.data.version}</version>
+                                </feature>
+
+
                                 <!-- END - Data source related -->
 
                                 <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product
index cf9cca05..4398635b 100644
--- a/modules/p2-profile/broker-profile/carbon.product
+++ b/modules/p2-profile/broker-profile/carbon.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.24" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product
index 3b6b09ec..79a83a52 100644
--- a/modules/p2-profile/iot-core-profile/carbon.product
+++ b/modules/p2-profile/iot-core-profile/carbon.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="4.4.17" useFeatures="true" includeLaunchers="true">
+version="4.4.24" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="4.4.17" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 80fd2694..a6d84421 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -244,6 +244,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Commons Features -->
@@ -292,8 +296,13 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version}
                                 </featureArtifactDef>
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.event.server.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
+                                    org.wso2.carbon.identity.inbound.auth.openid:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version}
@@ -353,10 +362,10 @@
                                 </featureArtifactDef>
                                 <!-- Authenticators -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
+                                    org.wso2.carbon.identity.local.auth.requestpath.basic:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
+                                    org.wso2.carbon.identity.local.auth.requestpath.oauth:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version}
@@ -377,7 +386,15 @@
                                     org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
                                 </featureArtifactDef>
                                 <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version}-->
+                                <!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.mgt.server.feature:${carbon.identity.framework.version}-->
+                                <!--</featureArtifactDef>-->
+
+
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity.governance:org.wso2.carbon.identity.governance.server.feature:${carbon.identity.governance.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity.governance:org.wso2.carbon.identity.captcha.server.feature:${carbon.identity.governance.version}-->
                                 <!--</featureArtifactDef>-->
 
                                 <!-- End of Identity Features -->
@@ -735,9 +752,19 @@
                                 </featureArtifactDef>
                                 <!--JWT grant type handler-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
+                                    org.wso2.carbon.extension.identity.oauth2.grantType.jwt:org.wso2.carbon.extension.identity.oauth2.jwt.feature:${identity.jwt.extension.version}
                                 </featureArtifactDef>
-                                <!-- Geo Dashboard feature -->
+                                <!--Consent management feature-->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.consent.mgt:org.wso2.carbon.consent.mgt.server.feature:${carbon.consent.mgt.version}
+                                </featureArtifactDef>
+
+                                <!--Database utils feature-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.utils:org.wso2.carbon.database.utils.feature:${org.wso2.carbon.database.utils.version}
+                                </featureArtifactDef>
+                                 <!--Geo Dashboard feature-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
@@ -1137,6 +1164,12 @@
                                     <id>org.wso2.carbon.forum.server.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Analytics Common Features -->
@@ -1230,6 +1263,12 @@
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.mgt.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.framework.version}</version>-->
+                                <!--</feature>-->
+
                                 <feature>
                                     <id>org.wso2.carbon.directory.service.mgr.server.feature.group
                                     </id>
@@ -1310,6 +1349,17 @@
                                 </feature>
                                 <!-- End of Identity Features -->
 
+                                <!--Identity governance-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--Identity governance ends-->
+
                                 <!-- Registry Features -->
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
@@ -1492,8 +1542,25 @@
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.identity.event.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+
                                 <!-- End of Identity Features -->
 
+                                <!--Identity governance-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.governance.version}</version>-->
+                                <!--</feature>-->
+                                <!--Identity governance ends-->
+
                                 <!-- Registry Features -->
                                 <feature>
                                     <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
@@ -1607,9 +1674,21 @@
                                 </feature>
                                 <!--jwt grant type handler-->
                                 <feature>
-                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
                                 </feature>
+                                <!--Consent Management Feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.consent.mgt.server.feature.group</id>
+                                    <version>${carbon.consent.mgt.version}</version>
+                                </feature>
+
+                                <!--Database utils feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.database.utils.feature.group</id>
+                                    <version>${org.wso2.carbon.database.utils.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -1679,9 +1758,18 @@
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.consent.mgt.server.feature.group</id>
+                                    <version>${carbon.consent.mgt.version}</version>
+                                </feature>
+                                <!--Database utils feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.database.utils.feature.group</id>
+                                    <version>${org.wso2.carbon.database.utils.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
@@ -1767,6 +1855,10 @@
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.event.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
@@ -1780,6 +1872,10 @@
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.mgt.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.framework.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
@@ -1844,6 +1940,10 @@
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.consent.mgt.server.feature.group</id>
+                                    <version>${carbon.consent.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
                                     <version>${identity.inbound.auth.saml.version}</version>
@@ -1993,6 +2093,10 @@
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.consent.mgt.server.feature.group</id>
+                                    <version>${carbon.consent.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2039,9 +2143,14 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
                                 </feature>
+                                <!--Database utils feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.database.utils.feature.group</id>
+                                    <version>${org.wso2.carbon.database.utils.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2199,6 +2308,10 @@
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.event.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
@@ -2225,6 +2338,7 @@
                                     <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2349,6 +2463,10 @@
                                     <id>org.wso2.carbon.forum.server.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
@@ -2671,7 +2789,7 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
                                 </feature>
                                 <feature>
@@ -2971,6 +3089,10 @@
                                     <id>org.wso2.carbon.forum.server.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
diff --git a/pom.xml b/pom.xml
index cc29e76e..a97ec7ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1446,7 +1446,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.17</carbon.kernel.version>
+        <carbon.kernel.version>4.4.24</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
         <carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
 
@@ -1483,63 +1483,68 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.5.8</carbon.commons.version>
+        <carbon.commons.version>4.6.21</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.7.3</carbon.deployment.version>
+        <carbon.deployment.version>4.7.15</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.7.5</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.11.124</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.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>
-        <identity.inbound.auth.oauth.version>5.3.11</identity.inbound.auth.oauth.version>
-        <identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version>
-        <identity.user.ws.version>5.1.4</identity.user.ws.version>
-        <identity.outbound.auth.requestpath.basicauth.version>5.1.1
-        </identity.outbound.auth.requestpath.basicauth.version>
-        <identity.outbound.auth.requestpath.oauth.version>5.1.1
-        </identity.outbound.auth.requestpath.oauth.version>
-        <identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
-        <identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
+        <identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version>
+        <identity.inbound.auth.openid.version>5.2.5</identity.inbound.auth.openid.version>
+        <identity.inbound.auth.saml.version>5.4.4</identity.inbound.auth.saml.version>
+        <identity.carbon.auth.saml2.version>5.2.5</identity.carbon.auth.saml2.version>
+        <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
+        <identity.carbon.auth.mutual.ssl.version>5.1.3</identity.carbon.auth.mutual.ssl.version>
+        <identity.user.ws.version>5.1.8</identity.user.ws.version>
+        <identity.outbound.auth.requestpath.basicauth.version>5.1.5</identity.outbound.auth.requestpath.basicauth.version>
+        <identity.outbound.auth.requestpath.oauth.version>5.1.4</identity.outbound.auth.requestpath.oauth.version>
+        <identity.outbound.auth.samlsso.version>5.1.12</identity.outbound.auth.samlsso.version>
+        <identity.metadata.saml2.version>1.0.5</identity.metadata.saml2.version>
         <identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>
-        <identity.application.authz.xacml>1.0.0</identity.application.authz.xacml>
+        <identity.application.authz.xacml>2.0.2</identity.application.authz.xacml>
+        <carbon.identity.governance.version>1.1.7</carbon.identity.governance.version>
 
         <!--JWT grant type extension feature-->
-        <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
+        <identity.jwt.extension.version>1.0.10</identity.jwt.extension.version>
+
+        <!--Consent Management feature-->
+        <carbon.consent.mgt.version>1.0.48</carbon.consent.mgt.version>
+
+        <!--Database utils version-->
+        <org.wso2.carbon.database.utils.version>2.0.6</org.wso2.carbon.database.utils.version>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.6.1</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.6.8</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.6.8</carbon.registry.version>
+        <carbon.registry.version>4.6.28</carbon.registry.version>
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.7.8</carbon.governance.version>
+        <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.240</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.242-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.0.136</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.137-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.2.157</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->
-        <carbon.mediation.version>4.6.10</carbon.mediation.version>
+        <carbon.mediation.version>4.6.61</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.1.17</carbon.analytics.common.version>
-        <carbon.analytics.version>1.3.3</carbon.analytics.version>
-        <carbon.analytics.das.version>1.3.5</carbon.analytics.das.version>
+        <carbon.analytics.common.version>5.1.32</carbon.analytics.common.version>
+        <carbon.analytics.version>1.3.16</carbon.analytics.version>
+        <carbon.analytics.das.version>1.3.16</carbon.analytics.das.version>
         <product.iot.analytics.version>${project.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>
@@ -1572,7 +1577,7 @@
 
         <!--IOT Analytics-->
         <shindig.version>2.0.2</shindig.version>
-        <carbon.data.version>4.3.6</carbon.data.version>
+        <carbon.data.version>4.4.41</carbon.data.version>
         <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
         <analytics.shared.version>1.0.3</analytics.shared.version>
 
@@ -1624,7 +1629,7 @@
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
         <carbon.dashboard.version>2.0.7</carbon.dashboard.version>
-        <carbon.event-processing.version>2.1.9</carbon.event-processing.version>
+        <carbon.event-processing.version>2.1.19</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>
 
@@ -1638,7 +1643,7 @@
         <carbon.store.version>1.5.1</carbon.store.version>
 
         <!-- Carbon Remote User Management version -->
-        <carbon.um.ws.version>5.1.4</carbon.um.ws.version>
+        <carbon.um.ws.version>5.1.5</carbon.um.ws.version>
 
         <!-- Cipher tool version-->
         <cipher.tool.version>1.0.0-wso2v5</cipher.tool.version>

From 954d3b0c0d7abd6abff4183711f5863bf8500659 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Mon, 12 Mar 2018 11:06:59 +0530
Subject: [PATCH 02/11] Update component versions

Updating the component versions and fixing bugs
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a97ec7ae..89e42f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <module>modules/tools</module>
         <module>modules/p2-profile</module>
         <module>modules/distribution</module>
-        <module>modules/integration</module>
+        <!--<module>modules/integration</module>-->
     </modules>
 
     <dependencyManagement>

From ef79cbeee69ef7c2b8155aa7f4b13c6f924724f7 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Mon, 12 Mar 2018 13:26:58 +0530
Subject: [PATCH 03/11] Update api management version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 89e42f82..fdf9d2d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1535,7 +1535,7 @@
         <carbon.device.mgt.plugin.version>4.0.137-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.2.157</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->

From 30d8b3d6ac4e35c4583411a7870a3fde4d238339 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Mon, 12 Mar 2018 17:43:07 +0530
Subject: [PATCH 04/11] Bump the devicemgt and plugins versions

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

diff --git a/pom.xml b/pom.xml
index fdf9d2d2..169797cf 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.0.242-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.1</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.0.137-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.1.0</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>

From 31f478ebcbc3e3a5605b616eb1e9f759b92489ca Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Mon, 12 Mar 2018 19:03:29 +0530
Subject: [PATCH 05/11] Fixing ouath2 application deployment failure and
 captcha error

---
 modules/distribution/src/assembly/bin.xml   |  6 ++++++
 modules/p2-profile/iot-core-profile/pom.xml | 22 +++++++++++++++++++++
 pom.xml                                     |  6 ++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c37a322e..6ce4cd3f 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -386,6 +386,12 @@
             <fileMode>644</fileMode>
         </fileSet>
 
+        <!--copy the cxf filters to cxf-runtime-->
+        <fileSet>
+            <directory>../cxf-filters/target/cxfFilters/jar</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib/runtimes/cxf</outputDirectory>
+        </fileSet>
+
         <!-- Copying APP Manager Publisher and Store Jaggery apps -->
         <fileSet>
             <directory>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index a6d84421..488bd79e 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -99,6 +99,15 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.governance:org.wso2.carbon.identity.captcha.server.feature:${identity.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.governance:org.wso2.carbon.identity.governance.feature:${identity.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.event.handler.accountlock:org.wso2.carbon.identity.handler.event.account.lock.feature:${identity.event.handler.account.lock.version}
+                                </featureArtifactDef>
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@@ -878,7 +887,20 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.captcha.server.feature.group</id>
+                                    <version>${identity.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.governance.feature.group</id>
+                                    <version>${identity.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.handler.event.account.lock.feature.group</id>
+                                    <version>${identity.event.handler.account.lock.version}</version>
+                                </feature>
                                 <!-- IoTServer Features -->
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
                                     <version>0.1.1</version>
diff --git a/pom.xml b/pom.xml
index 89e42f82..6f178bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
         <module>modules/features</module>
         <module>modules/scripts</module>
         <module>modules/tools</module>
+        <module>modules/cxf-filters</module>
         <module>modules/p2-profile</module>
         <module>modules/distribution</module>
         <!--<module>modules/integration</module>-->
@@ -492,7 +493,6 @@
                 <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-
             <!--MDM dependencies-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -1525,7 +1525,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.242-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.244-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1673,6 +1673,8 @@
         <apache.httpclient.version>4.5.2</apache.httpclient.version>
 
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <identity.governance.version>1.0.38</identity.governance.version>
+        <identity.event.handler.account.lock.version>1.1.12</identity.event.handler.account.lock.version>
     </properties>
 
     <scm>

From adff74f9c4ee0aab69c9b3c91229f8bc6b61acfb Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Mon, 12 Mar 2018 19:30:02 +0530
Subject: [PATCH 06/11] Adding cxf-filter

---
 modules/cxf-filters/pom.xml | 62 +++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 modules/cxf-filters/pom.xml

diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml
new file mode 100644
index 00000000..b2370b84
--- /dev/null
+++ b/modules/cxf-filters/pom.xml
@@ -0,0 +1,62 @@
+<!--
+  ~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.is</groupId>
+        <artifactId>identity-server-parent</artifactId>
+        <version>5.5.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2is-cxf-filters</artifactId>
+    <packaging>pom</packaging>
+    <name>Identity Server : cxf filters</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!-- Download JWT Bearer Grant jar from nexus and copy to the oauth2GrantCopied folder-->
+                    <execution>
+                        <id>download_oauth_client_authenticaion_proxy_jar</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
+                                    <artifactId>org.wso2.carbon.identity.oauth.client.authn.filter</artifactId>
+                                    <version>${identity.inbound.auth.oauth.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/cxfFilters/jar
+                                    </outputDirectory>
+                                    <includes>**/*.jar</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

From b26e9166bd6901da95eadc4374bde3d3a2d47a1c Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Mon, 12 Mar 2018 19:34:19 +0530
Subject: [PATCH 07/11] Correcting parent id

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

diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml
index b2370b84..98e243bc 100644
--- a/modules/cxf-filters/pom.xml
+++ b/modules/cxf-filters/pom.xml
@@ -17,8 +17,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.is</groupId>
-        <artifactId>identity-server-parent</artifactId>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>5.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

From b9053cffd34b0d3a4250901b297042e4c15649c5 Mon Sep 17 00:00:00 2001
From: Ruwan Yatawara <ruwan.yatawara@Ruwans-MacBook-Pro.local>
Date: Mon, 12 Mar 2018 19:36:09 +0530
Subject: [PATCH 08/11] correcting version

---
 modules/cxf-filters/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml
index 98e243bc..c06e3a69 100644
--- a/modules/cxf-filters/pom.xml
+++ b/modules/cxf-filters/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>5.5.0-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 3234b776d641b670412144606073362e64d052bb Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Tue, 13 Mar 2018 10:25:40 +0530
Subject: [PATCH 09/11] Update the message broker and kernel versions

---
 modules/p2-profile/analytics-profile/carbon.product |  4 ++--
 modules/p2-profile/broker-profile/carbon.product    |  4 ++--
 modules/p2-profile/iot-core-profile/carbon.product  |  4 ++--
 pom.xml                                             | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product
index 4398635b..e6000463 100644
--- a/modules/p2-profile/analytics-profile/carbon.product
+++ b/modules/p2-profile/analytics-profile/carbon.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.24" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.25" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product
index 4398635b..e6000463 100644
--- a/modules/p2-profile/broker-profile/carbon.product
+++ b/modules/p2-profile/broker-profile/carbon.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.24" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.25" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product
index 79a83a52..125b454c 100644
--- a/modules/p2-profile/iot-core-profile/carbon.product
+++ b/modules/p2-profile/iot-core-profile/carbon.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="4.4.24" useFeatures="true" includeLaunchers="true">
+version="4.4.25" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="4.4.24" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.24"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
    </features>
 
   <configurations>
diff --git a/pom.xml b/pom.xml
index a1d10195..5999bb1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1446,7 +1446,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.24</carbon.kernel.version>
+        <carbon.kernel.version>4.4.25</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
         <carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
 
@@ -1525,7 +1525,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.244-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.3</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1563,8 +1563,8 @@
 
         <!-- IoT Broker Dependencies -->
         <product.iot.broker.version>${project.version}</product.iot.broker.version>
-        <andes.version>3.2.25</andes.version>
-        <carbon.messaging.version>3.2.16</carbon.messaging.version>
+        <andes.version>3.2.45</andes.version>
+        <carbon.messaging.version>3.2.32</carbon.messaging.version>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
@@ -1609,7 +1609,7 @@
         <commons.lang3.version>3.3.2</commons.lang3.version>
         <commons.lang.version>2.2</commons.lang.version>
         <commons.io.version>2.4</commons.io.version>
-        <axis2.wso2.version>1.6.1.wso2v12</axis2.wso2.version>
+        <axis2.wso2.version>1.6.1.wso2v23</axis2.wso2.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <gson.version>2.3.1</gson.version>
         <slf4j.log4j12.version>1.6.1</slf4j.log4j12.version>

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 10/11] 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 11/11] 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>