Merge pull request #1422 from ruwany/master

Bumping apimgt,andes,bussiness-messaging versions
7 years ago · 3eab9ad1d1
parent 1df597d512 2edb44d066
commit 3eab9ad1d1
6 changed files with 27 additions and 3 deletions
--- 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
--- 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=$?
--- 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=$?
--- 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=$?
--- 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>
--- 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 -->