From 2edb44d066819de65529cfd9e9aa5e432f07f821 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Thu, 21 Sep 2017 19:45:17 +0530
Subject: [PATCH] Bumping apimgt,andes,bussiness-messaging versions

---
 .../distribution/src/core/bin/iot-server.sh   |  1 +
 .../resources/profiles/backend/iot-server.sh  |  1 +
 .../profiles/keymanager/iot-server.sh         |  1 +
 .../resources/profiles/manager/iot-server.sh  |  1 +
 modules/p2-profile/iot-core-profile/pom.xml   | 20 +++++++++++++++++++
 pom.xml                                       |  6 +++---
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/src/core/bin/iot-server.sh
index a3ef3be0..ac4b12e3 100755
--- a/modules/distribution/src/core/bin/iot-server.sh
+++ b/modules/distribution/src/core/bin/iot-server.sh
@@ -332,6 +332,7 @@ do
     -Diot.apimpublisher.https.port="9443" \
     -Diot.apimstore.host="localhost" \
     -Diot.apimstore.https.port="9443" \
+    -Dmqtt.broker.https.port="9446" \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
 done
diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
index c182e1fd..530e0e7f 100755
--- a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
@@ -335,6 +335,7 @@ do
     -Diot.apimpublisher.https.port="9443" \
     -Diot.apimstore.host="localhost" \
     -Diot.apimstore.https.port="9443" \
+    -Dmqtt.broker.https.port="9446" \
     $NODE_PARAMS \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
index b46482d9..897c9b53 100755
--- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
@@ -335,6 +335,7 @@ do
     -Diot.apimpublisher.https.port="9443" \
     -Diot.apimstore.host="localhost" \
     -Diot.apimstore.https.port="9443" \
+    -Dmqtt.broker.https.port="9446" \
     $NODE_PARAMS \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
index f21aa8d2..0e3483d7 100755
--- a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
@@ -335,6 +335,7 @@ do
     -Diot.apimpublisher.https.port="9443" \
     -Diot.apimstore.host="localhost" \
     -Diot.apimstore.https.port="9443" \
+    -Dmqtt.broker.https.port="9446" \
     $NODE_PARAMS \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 7b85ce59..14884c37 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -755,6 +755,11 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Geo Dashboard feature -->
+
+                                <!--MQTT Dashboard-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1633,6 +1638,11 @@
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
                             </features>
+                            <!--MQTT Dashboard Feature-->
+                            <feature>
+                                <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                <version>${carbon.device.mgt.plugin.version}</version>
+                            </feature>
                         </configuration>
                     </execution>
 					
@@ -2517,6 +2527,11 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                            <!--MQTT Dashboard Feature-->
+                            <feature>
+                                <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                <version>${carbon.device.mgt.plugin.version}</version>
+                            </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -3147,6 +3162,11 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                            <!--MQTT Dashboard Feature-->
+                            <feature>
+                                <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                <version>${carbon.device.mgt.plugin.version}</version>
+                            </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 27adddcc..f7bf7374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1517,17 +1517,17 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.106</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.112</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.80</carbon.device.mgt.plugin.version>
+	<carbon.device.mgt.plugin.version>4.0.82</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->