Merge branch 'master' of https://github.com/wso2/product-iots

modules/p2-profile-gen/pom.xml

@@ -688,8 +688,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
-                                
-				<featureArtifactDef>
+				                <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
                                 <!--End of DAS Feature-->
@@ -711,6 +710,10 @@
                                 <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>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1488,6 +1491,11 @@
                                     <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>
                             </features>
                         </configuration>
                     </execution>

pom.xml

@@ -1109,7 +1109,7 @@
         <!--DAS-->
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
-        <carbon.dashboard.version>1.0.16</carbon.dashboard.version>
+        <carbon.dashboard.version>1.0.17</carbon.dashboard.version>
         <shindig.version>2.5.2</shindig.version>
         <carbon.event-processing.version>2.0.13-alpha</carbon.event-processing.version>
         <carbon.data.version>4.3.4</carbon.data.version>