From f392b7d855956345d368ff0c4ea4ec62929fc97d Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Mon, 16 Oct 2017 10:49:01 +0530
Subject: [PATCH 1/2] Removing analytics.dashboard feature from product-iots.

---
 modules/p2-profile/iot-core-profile/pom.xml | 40 +++------------------
 pom.xml                                     |  4 +--
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 14884c37..b92d3570 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -193,9 +193,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
                                 <!-- IoT Device Management Features -->
 
                                 <!-- Carbon Deployment Features -->
@@ -746,10 +743,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
                                 </featureArtifactDef>
-                                <!-- Analytics related features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
                                 <!-- Geo Dashboard feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
@@ -1011,10 +1004,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -1621,11 +1610,6 @@
                                     <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
                                 </feature>
-                                <!-- Analytics related features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -1637,12 +1621,12 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </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>
 					
@@ -2051,10 +2035,6 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -2481,10 +2461,6 @@
                                     <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.stream.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
@@ -2699,10 +2675,6 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <feature>
@@ -3104,10 +3076,6 @@
                                     <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.stream.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
diff --git a/pom.xml b/pom.xml
index 22ea2798..920cf10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.135</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.158</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.87</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.88</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>

From 1ddd7e8b619815fa671b6b24cf1f1a5498885a82 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Mon, 16 Oct 2017 21:39:36 +0530
Subject: [PATCH 2/2] Removing the analytics dashboard components from
 instrumentation.

---
 .../tests-integration/src/test/resources/instrumentation.txt  | 2 --
 pom.xml                                                       | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
index 8e73b3de..d8c07c05 100644
--- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt
+++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
@@ -1,5 +1,4 @@
 org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization_
-org.wso2.carbon.device.mgt.analytics.dashboard_
 org.wso2.carbon.device.mgt.analytics.data.publisher_
 org.wso2.carbon.device.mgt.common_
 org.wso2.carbon.device.mgt.core_
@@ -34,7 +33,6 @@ 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.device.mgt.analytics.dashboard_
 org.wso2.carbon.complex.policy.decision.point_
 org.wso2.carbon.appmgt.mdm.osgiconnector_
 org.wso2.carbon.appmgt.mdm.restconnector_
diff --git a/pom.xml b/pom.xml
index 920cf10a..4e8d7143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1516,8 +1516,8 @@
         <!-- Carbon Governance -->
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
-        <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.158</carbon.device.mgt.version>
+        <!-- Carbon Device Management-->
+        <carbon.device.mgt.version>3.0.144</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->