From 4854851589464125002925d35aa866f21a062d3f Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Fri, 2 Dec 2016 14:50:01 +0530
Subject: [PATCH 1/5] bumping the appm version up

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

diff --git a/pom.xml b/pom.xml
index 49d98fd8..01b92275 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1656,7 +1656,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.5</appmgt.feature.version>
+        <appmgt.feature.version>1.2.7</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>
@@ -1879,4 +1879,4 @@
         </repository>
     </repositories>
 
-</project>
\ No newline at end of file
+</project>

From 0e184a39b1bc3687891e0d294d0ce67e9fd97f0a Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Fri, 2 Dec 2016 16:09:36 +0530
Subject: [PATCH 2/5] bumping up appm version

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

diff --git a/pom.xml b/pom.xml
index 01b92275..9f380a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1656,7 +1656,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.7</appmgt.feature.version>
+        <appmgt.feature.version>1.2.8-SNAPSHOT</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>

From 47a9d9a767d5646e53c370bc4d8777f5ff59fbc9 Mon Sep 17 00:00:00 2001
From: GPrathap <ggeesara@gmail.com>
Date: Fri, 2 Dec 2016 18:58:26 +0530
Subject: [PATCH 3/5] 	added mb related new configurations

---
 .../distribution/src/main/assembly/bin.xml    | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/modules/broker/distribution/src/main/assembly/bin.xml b/modules/broker/distribution/src/main/assembly/bin.xml
index b76a5117..15dda311 100644
--- a/modules/broker/distribution/src/main/assembly/bin.xml
+++ b/modules/broker/distribution/src/main/assembly/bin.xml
@@ -223,6 +223,33 @@
             </excludes>
             <fileMode>644</fileMode>
         </fileSet>
+        <!--QPID related configurations-->
+        <fileSet>
+            <directory>
+                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
+            </directory>
+            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/advanced</outputDirectory>
+            <includes>
+                <include>**/qpid-config.xml</include>
+                <include>**/qpid-virtualhosts.xml</include>
+                <include>**/qpid-jmxremote.access</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        <!--Multitenancy related file -->
+        <fileSet>
+            <directory>
+                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
+            </directory>
+            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/multitenancy</outputDirectory>
+            <includes>
+                <include>**/stratos.xml</include>
+                <include>**/multitenancy-packages.xml</include>
+                <include>**/usage-throttling-agent-config.xml</include>
+                <include>**/cloud-services-desc.xml</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
         <!-- copy the landing page webapp -->
         <fileSet>
             <directory>lib/home</directory>
@@ -409,6 +436,30 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>
+                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
+            </source>
+            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/etc/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
+            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>false</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/metrics.xml</source>
+            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>false</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
@@ -442,5 +493,19 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <!--End of Cipher Tool Files-->
+        <file>
+            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>
+                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>

From 48f1414ca584544b3f95b192de926cf79a0f9aac Mon Sep 17 00:00:00 2001
From: GPrathap <ggeesara@gmail.com>
Date: Fri, 2 Dec 2016 18:59:06 +0530
Subject: [PATCH 4/5] 	updated carbon messaging and andes versions

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8ce33c1..bf45fb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1215,7 +1215,7 @@
             <dependency>
                 <groupId>org.wso2.andes.wso2</groupId>
                 <artifactId>andes-client</artifactId>
-                <version>3.2.0-SNAPSHOT</version>
+                <version>${andes.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.andes.wso2</groupId>
@@ -1521,7 +1521,7 @@
         <identity.local.auth.basicauth.version>5.1.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.1.1</identity.inbound.auth.saml.version>
-        <identity.carbon.auth.saml2.version>5.1.2</identity.carbon.auth.saml2.version>
+        <identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
         <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
         <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
         <identity.user.ws.version>5.1.2</identity.user.ws.version>
@@ -1542,14 +1542,14 @@
         <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.3-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.2-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
@@ -1580,8 +1580,8 @@
 
         <!-- IoT Broker Dependencies -->
         <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
-        <andes.version>3.2.0-SNAPSHOT</andes.version>
-        <carbon.messaging.version>3.2.0-SNAPSHOT</carbon.messaging.version>
+        <andes.version>3.1.3</andes.version>
+        <carbon.messaging.version>3.1.3</carbon.messaging.version>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
@@ -1656,7 +1656,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.5</appmgt.feature.version>
+        <appmgt.feature.version>1.2.8-SNAPSHOT</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>
@@ -1675,7 +1675,7 @@
         <project.scm.id>github-scm</project.scm.id>
 
         <!-- Carbon Metrics Features -->
-        <carbon.metrics.version>1.2.0</carbon.metrics.version>
+        <carbon.metrics.version>1.2.2</carbon.metrics.version>
 
         <!--http client version-->
         <httpclient.version>4.5.2</httpclient.version>

From 5cd3b6a2a8f29ed3dfbcb2f6063dcf4ce969b7fa Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Mon, 5 Dec 2016 13:50:18 +0530
Subject: [PATCH 5/5] Adding appstore module

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

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index c08ba5cc..c504063c 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -200,6 +200,7 @@
                 <include>**/i18n/</include>
                 <include>**/ws/</include>
                 <include>**/appmgtpublisher/</include>
+                <include>**/appstore/</include>
                 <include>**/store/</include>
                 <include>**/lifecycle/</include>
                 <include>**/utils/</include>