add pom.xml changes

issue_template.md

@@ -0,0 +1,18 @@
+**Description:**
+<!-- Give a brief description of the issue -->
+
+**Suggested Labels:**
+<!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels-->
+
+**Suggested Assignees:**
+<!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees-->
+
+**Affected Product Version:**
+
+**OS, DB, other environment details and versions:**    
+
+**Steps to reproduce:**
+
+
+**Related Issues:**
+<!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->

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

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=$?

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=$?

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=$?

modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java

@@ -230,7 +230,8 @@ public class CarbonServerManagerExtension {
             if(this.isCoverageEnable) {
                 try {
                     log.info("Generating Jacoco code coverage...");
-                    this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator));
+                    this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2"
+                            + File.separator + "components" + File.separator + "plugins" + File.separator));
                 } catch (IOException var7) {
                     log.error("Failed to generate code coverage ", var7);
                     throw new AutomationFrameworkException("Failed to generate code coverage ", var7);

modules/integration/tests-integration/pom.xml

@@ -90,18 +90,17 @@
                 <executions>
 
                     <execution>
-                        <id>copy-emma-dependencies</id>
+                        <id>copy-jacoco-dependencies</id>
                         <phase>compile</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/emma</outputDirectory>
+                            <outputDirectory>${project.build.directory}/jacoco</outputDirectory>
                             <includeTypes>jar</includeTypes>
-                            <includeArtifactIds>emma</includeArtifactIds>
+                            <includeArtifactIds>org.jacoco.agent</includeArtifactIds>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-secVerifier</id>
                         <phase>compile</phase>
@@ -272,6 +271,10 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.agent</artifactId>
+        </dependency>
     </dependencies>
 
     <properties>

modules/integration/tests-integration/src/test/resources/automation.xml

@@ -32,7 +32,7 @@
         <!--
          Change this to true if you want to generate coverage statistics
         -->
-        <coverage>false</coverage>
+        <coverage>true</coverage>
         <!--
          Change this to true if you want to enable framework dashboard
         -->

modules/integration/tests-integration/src/test/resources/instrumentation.txt

@@ -14,6 +14,7 @@ org.wso2.carbon.device.mgt.input.adapter.extension_
 org.wso2.carbon.device.mgt.input.adapter.mqtt_
 org.wso2.carbon.device.mgt.input.adapter.thrift_
 org.wso2.carbon.device.mgt.input.adapter.xmpp_
+org.wso2.carbon.device.mgt.input.adapter.http_
 org.wso2.carbon.device.mgt.mobile.android_
 org.wso2.carbon.device.mgt.mobile.windows_
 org.wso2.carbon.device.mgt.mqtt.notification.listener_
@@ -32,4 +33,8 @@ org.wso2.carbon.certificate.mgt.core_
 org.wso2.carbon.email.sender.core_
 org.wso2.carbon.identity.jwt.client.extension_
 org.wso2.carbon.identity.authenticator.backend.oauth_
-org.wso2.carbon.webapp.authenticator.framework_
+org.wso2.carbon.webapp.authenticator.framework_
+org.wso2.carbon.device.mgt.analytics.dashboard_
+org.wso2.carbon.complex.policy.decision.point_
+org.wso2.carbon.appmgt.mdm.osgiconnector_
+org.wso2.carbon.appmgt.mdm.restconnector_

modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx

@@ -2166,6 +2166,15 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS",
             </collectionProp>
           </HeaderManager>
           <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="1022908240">Status of android device that carries the id \u0027d24f870f390352a41000${DeviceID}\u0027 is ACTIVE</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
         </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Requesting the List of Installed Applications on Android Devices" enabled="true">
           <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
@@ -8702,6 +8711,159 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS&quot;,&#xd;
           </HeaderManager>
           <hashTree/>
         </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Android Device Management - Un enroll Device" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain">${host}</stringProp>
+          <stringProp name="HTTPSampler.port">${https_port}</stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+          <stringProp name="HTTPSampler.protocol">https</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID}</stringProp>
+          <stringProp name="HTTPSampler.method">DELETE</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${access_token}</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-446982528">Android device that carries id \u0027d24f870f390352a4${DeviceID}\u0027 has successfully dis-enrolled</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Android Device Management - GET Status after disenrolling" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain">${host}</stringProp>
+          <stringProp name="HTTPSampler.port">${https_port}</stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+          <stringProp name="HTTPSampler.protocol">https</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID}/status</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${access_token}</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-1864237737">Status of android device that carries the id \u0027d24f870f390352a4${DeviceID}\u0027 is REMOVED</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Android Device Management - GET Status of a non-existing device" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain">${host}</stringProp>
+          <stringProp name="HTTPSampler.port">${https_port}</stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+          <stringProp name="HTTPSampler.protocol">https</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/api/device-mgt/android/v1.0/devices/d24f870f390352sssa4${DeviceID}/status</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${access_token}</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="1779149808">No Android device is found upon the id \u0027d24f870f390352sssa4${DeviceID}\u0027</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">true</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="51512">404</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">8</intProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
       </hashTree>
       <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
         <boolProp name="ResultCollector.error_logging">false</boolProp>

modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json

@@ -5,7 +5,7 @@
   },
   "GET": {
     "responseCode": "OK",
-    "responseMessage": "Android device that carries the id \u0027d24f870f390352a41234\u0027 is enrolled"
+    "responseMessage": "Status of android device that carries the id \u0027d24f870f390352a41234\u0027 is ACTIVE"
   },
   "PUT": {
     "responseCode": "Accepted",

modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json

@@ -1,9 +1,10 @@
 {
   "POST": {
-    "username":"PRIMARY/username123",
+    "basicUserInfo" : {"username":"PRIMARY/username123",
     "firstname":"userfirstname",
     "lastname":"userlastname",
-    "emailAddress":"user123@gmail.com"
+    "emailAddress":"user123@gmail.com"},
+    "message":"Mail Server is not configured. Email invitation will not be sent."
   },
   "PUT": {
     "username":"username123",

modules/integration/tests-iot-web-ui/pom.xml

@@ -91,20 +91,6 @@
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-
-                    <execution>
-                        <id>copy-emma-dependencies</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/emma</outputDirectory>
-                            <includeTypes>jar</includeTypes>
-                            <includeArtifactIds>emma</includeArtifactIds>
-                        </configuration>
-                    </execution>
-
                     <execution>
                         <id>copy-secVerifier</id>
                         <phase>compile</phase>

modules/integration/tests-iot-web-ui/src/test/resources/automation.xml

@@ -32,7 +32,7 @@
         <!--
          Change this to true if you want to generate coverage statistics
         -->
-        <coverage>false</coverage>
+        <coverage>true</coverage>
         <!--
          Change this to true if you want to enable framework dashboard
         -->

modules/integration/tests-iot-web-ui/src/test/resources/emma.properties

@@ -1,105 +0,0 @@
-# -------------------------------------------------------------
-#
-# for user-editable property overrides use one of these options:
-#
-# (1) option-specific command line overrides, e.g.
-#     -Dreport.txt.out.file=coverage.txt
-#
-# (2) '-p <options file>' command line option,
-#
-# (3) 'emma.properties' resource placed somewhere in the classpath
-#     (e.g., in <jre dir>\classes directory -- note that it does
-#     not exist by default),
-#
-# (4) '-Demma.*' JVM options, e.g.
-#     -Demma.report.txt.out.file=coverage.txt
-#
-# (5) 'emma.properties' JVM option pointing to a properties file
-#     -Demma.properties=./myproperties.txt
-# -------------------------------------------------------------
-
-# -------------------------------------------------------------
-# logging properties:
-
-verbosity.level:	none
-
-# classloading properties:
-
-#clsload.forced_delegation_filter:
-#clsload.through_delegation_filter: -*
-
-# -------------------------------------------------------------
-
-# instrumentation properties:
-
-instr.exclude_empty_classes:	true
-instr.exclude_synthetic_methods:	true
-instr.exclude_bridge_methods:		true
-instr.do_suid_compensation:		true
-
-# -------------------------------------------------------------
-
-# runtime properties:
-
-rt.control:			false
-rt.control.host:	localhost
-#rt.control.port:	44444
-
-rt.filelock:			true
-#rt.filelock.portbase:	59141
-rt.filelock.maxtime:	120000
-rt.filelock.retries:	11
-
-# -------------------------------------------------------------
-
-# apprunner session data output properties:
-
-session.out.file:	coverage.es
-session.out.merge:	true
-
-# -------------------------------------------------------------
-
-# runtime coverage data output properties:
-
-coverage.out.file:	coverage.ec
-coverage.out.merge:	true
-
-# -------------------------------------------------------------
-
-# instr metadata output properties:
-
-metadata.out.file:	coverage.em
-metadata.out.merge:	true
-
-# -------------------------------------------------------------
-
-# common report defaults:
-
-report.units:		instr
-report.depth:		method
-report.columns:		name, line, block, method, class
-report.sort:		-line,-block,-method,-class,+name
-report.metrics:		method:40,block:80,line:40,class:100
-
-# -------------------------------------------------------------
-# txt report properties:
-
-report.txt.depth:	all
-report.txt.columns:	class,method,block,line,name
-report.txt.out.file:	coverage.txt
-
-# -------------------------------------------------------------
-# html report properties:
-
-#report.html.out.dir:	coverage
-#report.html.out.file:	/Users/azeez/Desktop/coverage/index.html
-report.html.out.encoding: ISO-8859-1
-
-# -------------------------------------------------------------
-# xml report properties:
-
-#report.xml.out.file:	coverage.xml
-report.xml.out.encoding: UTF-8
-# -------------------------------------------------------------
-# end of file
-

modules/p2-profile/iot-core-profile/pom.xml

@@ -755,11 +755,19 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Geo Dashboard feature -->
+<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Realtime Operations Feature -->
+=======
+
+                                <!--MQTT Dashboard-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1644,6 +1652,11 @@
                                 </feature>
                                 <!-- End of Realtime Operations 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>
 					
@@ -2528,12 +2541,20 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations 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>
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>
@@ -3168,12 +3189,20 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations 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>
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>

modules/scripts/change-ip.sh

@@ -64,7 +64,7 @@ echo "Completed!!"
 
 #--------------------
 echo "Changing <IoT_HOME>/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json"
-sed -i -e 's/"identityProvider.*/\"identityProviderUrl\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
+sed -i -e 's/"identityProvider.*/\"identityProviderURL\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
 echo "Completed!!"
 
 #--------------------

pom.xml

@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>org.wso2.carbon.automation</groupId>
                 <artifactId>org.wso2.carbon.automation.engine</artifactId>
-                <version>${test.framework.version}</version>
+                <version>${platform.integration.utils.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -1517,17 +1517,20 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.93-SNAPSHOT</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.66-SNAPSHOT</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 -->
@@ -1555,8 +1558,8 @@
 
         <!-- IoT Broker Dependencies -->
         <product.iot.broker.version>${project.version}</product.iot.broker.version>
-        <andes.version>3.2.19</andes.version>
+        <andes.version>3.2.25</andes.version>
-        <carbon.messaging.version>3.2.15</carbon.messaging.version>
+        <carbon.messaging.version>3.2.16</carbon.messaging.version>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
@@ -1596,7 +1599,7 @@
         <carbon.automationutils.version>4.4.2</carbon.automationutils.version>
         <carbon.automation.jmeter.version>4.2.7</carbon.automation.jmeter.version>
         <xfer.version>3.3.0</xfer.version>
-        <jacoco.agent.version>0.7.4.201502262128</jacoco.agent.version>
+        <jacoco.agent.version>0.7.5.201505241946</jacoco.agent.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <commons.lang3.version>3.3.2</commons.lang3.version>
         <commons.lang.version>2.2</commons.lang.version>
@@ -1629,7 +1632,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.35</appmgt.feature.version>
+        <appmgt.feature.version>1.2.40</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.5.1</carbon.store.version>
@@ -1760,10 +1763,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-project-info-reports-plugin</artifactId>