Fix conflicts with new cdmf versions

modules/distribution/pom.xml

@@ -292,6 +292,11 @@
 									<output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml</output>
 									<config>src/analytics/conf/datasource_config_change.xml</config>
 								</transformation>
+								<transformation>
+									<input>${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</input>
+									<output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</output>
+									<config>src/analytics/conf/cdm_config_change.xml</config>
+								</transformation>
 							</transformations>
 						</configuration>
 					</execution>

modules/distribution/src/analytics/conf/cdm_config_change.xml

@@ -0,0 +1,12 @@
+<processor>
+    <!-- Remove current PushNotificationProviders config -->
+    <remove>
+        <name>//DeviceMgtConfiguration/PushNotificationConfiguration/PushNotificationProviders</name>
+    </remove>
+
+    <!-- Add modified Carbon db and UM db config -->
+    <add>
+        <inside>//DeviceMgtConfiguration/PushNotificationConfiguration</inside>
+        <file>src/analytics/conf/push_notification_config.xml</file>
+    </add>
+</processor>

modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml

@@ -0,0 +1,45 @@
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+    <datasources>
+        <datasource>
+            <name>DM_DS</name>
+            <description>The datasource used for CDM</description>
+            <jndiConfig>
+                <name>jdbc/DM_DS</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:../../repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>

modules/distribution/src/analytics/conf/output-adapter-change.xml

@@ -2,7 +2,21 @@
 	<!-- Add outpu event adapter config element -->
 	<add>
 		<after>/outputEventAdaptersConfig/adapterConfig[@type="websocket"]</after>
-		<value><![CDATA[<adapterConfig type="oauth-mqtt">
+		<value><![CDATA[<adapterConfig type="oauth-http">
+      <!-- Thread Pool Related Properties -->
+        <property key="minThread">8</property>
+        <property key="maxThread">100</property>
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+        <property key="connectionKeepAliveInterval">60</property>
+        <property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
+        <property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
+        <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+        <property key="username">admin</property>
+        <property key="password">admin</property>
+    </adapterConfig>
+
+    <adapterConfig type="oauth-mqtt">
       <!-- Thread Pool Related Properties -->
         <property key="minThread">8</property>
         <property key="maxThread">100</property>

modules/distribution/src/analytics/conf/push_notification_config.xml

@@ -0,0 +1,5 @@
+<config>
+    <PushNotificationProviders>
+
+    </PushNotificationProviders>
+</config>

modules/distribution/src/assembly/bin.xml

@@ -70,9 +70,6 @@
                 <exclude>**/master-datasources.xml</exclude>
                 <exclude>**/carbon.xml</exclude>
                 <exclude>**/registry.xml</exclude>
-                <exclude>**/client-truststore.jks</exclude>
-                <exclude>**/wso2carbon.jks</exclude>
-                <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/lib/httpmime*</exclude>
@@ -253,8 +250,6 @@
                 <exclude>**/synapse-configs/**</exclude>
                 <exclude>**/web-apps/**</exclude>
                 <exclude>**/appm-tenant-conf.xml</exclude>
-				<exclude>**/client-truststore.jks</exclude>
-				<exclude>**/wso2carbon.jks</exclude>
             </excludes>
 
         </fileSet>
@@ -326,10 +321,6 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
             </outputDirectory>
-			<excludes>
-				<exclude>**/client-truststore.jks</exclude>
-				<exclude>**/wso2carbon.jks</exclude>
-			</excludes>
         </fileSet>
 
         <!-- Copying device type deployer files -->
@@ -697,8 +688,6 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
-				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
-				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -722,6 +711,13 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                src/analytics/conf/datasources
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/datasources</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>
                 src/analytics/conf/analytics/spark
@@ -988,8 +984,6 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
-				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
-				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -1239,6 +1233,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/conf/etc/device-analytics-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/etc</outputDirectory>
+            <destName>device-analytics-config.xml</destName>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying synapse-handlers.xml file -->
         <file>
             <source>src/core/conf/synapse-handlers.xml</source>
@@ -1972,41 +1973,5 @@
             <fileMode>644</fileMode>
         </file>
         <!-- ********************************* End of Broker Profile ********************************* -->
-
-		<!--Start - Need to remove after kernel 4.4.17 release-->
-		<file>
-			<source>src/core/resources/security/client-truststore.jks</source>
-			<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
-			<fileMode>644</fileMode>
-		</file>
-		<file>
-			<source>src/core/resources/security/client-truststore.jks</source>
-			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
-			<fileMode>644</fileMode>
-		</file>
-		<file>
-			<source>src/core/resources/security/client-truststore.jks</source>
-			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
-			<fileMode>644</fileMode>
-		</file>
-        <file>
-            <source>src/core/resources/security/wso2carbon.jks</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/core/resources/security/wso2carbon.jks</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/core/resources/security/wso2carbon.jks</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-		<!--End-->
     </files>
 </assembly>

modules/distribution/src/core/conf/datasources/cdm-datasources.xml

@@ -29,7 +29,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>

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

@@ -18,6 +18,9 @@
 
 package org.wso2.iot.integration.common.extensions;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -36,6 +39,7 @@ import org.wso2.carbon.automation.extensions.servers.utils.ServerLogReader;
 import javax.xml.xpath.XPathExpressionException;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -57,6 +61,7 @@ public class CarbonServerManagerExtension {
     private static final String CMD_ARG = "cmdArg";
     private static int defaultHttpPort = Integer.parseInt("9763");
     private static int defaultHttpsPort = Integer.parseInt("9443");
+    private static final long COVERAGE_DUMP_WAIT_TIME = 30000;
 
     public CarbonServerManagerExtension(AutomationContext context) {
         this.automationContext = context;
@@ -246,6 +251,7 @@ public class CarbonServerManagerExtension {
     }
 
     private void generateCoverageReport(File classesDir) throws IOException, AutomationFrameworkException {
+        checkJacocoDataFileSizes(FrameworkPathUtil.getJacocoCoverageHome());
         CodeCoverageUtils.executeMerge(FrameworkPathUtil.getJacocoCoverageHome(), FrameworkPathUtil.getCoverageMergeFilePath());
         ReportGenerator reportGenerator = new ReportGenerator(new File(FrameworkPathUtil.getCoverageMergeFilePath()), classesDir, new File(CodeCoverageUtils.getJacocoReportDirectory()), (File)null);
         reportGenerator.create();
@@ -374,4 +380,48 @@ public class CarbonServerManagerExtension {
         }
 
     }
+
+    /**
+     * To check jacoco file sizes and wait for them to get created..
+     *
+     * @param filePath File Path of the jacoco data files.
+     */
+    private void checkJacocoDataFileSizes(String filePath) {
+        Collection<File> fileSetsCollection = FileUtils
+                .listFiles(new File(filePath), new RegexFileFilter("[^s]+(." + "(?i)(exec))$"),
+                        DirectoryFileFilter.DIRECTORY);
+
+        for (File inputFile : fileSetsCollection) {
+            if (inputFile.isDirectory()) {
+                continue;
+            }
+            //retry to check whether exec data file is non empty.
+            waitForCoverageDumpFileCreation(inputFile);
+        }
+    }
+
+    /**
+     * This is to wait for jacoco exe file creation.
+     *
+     * @param file File that need to be created.
+     */
+    private void waitForCoverageDumpFileCreation(File file) {
+        long currentTime = System.currentTimeMillis();
+        long waitTime = currentTime + COVERAGE_DUMP_WAIT_TIME;
+
+        while (waitTime > System.currentTimeMillis()) {
+            if (file.length() > 0) {
+                log.info("Execution data file non empty file size in KB : " + file.length() / 1024);
+                break;
+            } else {
+                try {
+                    log.warn("Execution data file is empty file size in KB : " + file.length() / 1024);
+                    Thread.sleep(500);
+                } catch (InterruptedException ignored) {
+                    log.warn("Sleep interrupted ", ignored);
+                }
+            }
+        }
+    }
+
 }

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_

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

@@ -817,7 +817,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS",
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/18022362098305316308</stringProp>
+          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs338</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -852,7 +852,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS&quot;,&#xd;
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/18022362098305316308</stringProp>
+          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33</stringProp>
           <stringProp name="HTTPSampler.method">DELETE</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -5005,7 +5005,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS&quot;,&#xd;
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/18022362098305316308</stringProp>
+          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -5119,7 +5119,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS&quot;,&#xd;
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/18022362098305316308</stringProp>
+          <stringProp name="HTTPSampler.path">/api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33</stringProp>
           <stringProp name="HTTPSampler.method">DELETE</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>

modules/p2-profile/analytics-profile/carbon.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.16" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
    </features>
 
   <configurations>

modules/p2-profile/analytics-profile/pom.xml

@@ -94,6 +94,15 @@
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.basics.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
                                 <!-- START - Analytics Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version}
@@ -388,9 +397,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-								<featureArtifactDef>
+                                <featureArtifactDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.feature:${carbon.device.mgt.plugin.version}
-								</featureArtifactDef>
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
@@ -443,6 +458,18 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.basics.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
                                 <!-- START - Analytics Features -->
                                 <feature>
                                     <id>org.wso2.carbon.analytics.core.feature.group</id>
@@ -826,13 +853,20 @@
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.extension.siddhi.devicegroup.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
 
 								<!--android sense analytics feature-->
 								<feature>
 									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <feature>
                                     <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>

modules/p2-profile/broker-profile/carbon.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.16" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -13,7 +13,7 @@
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
    </features>
 
   <configurations>

modules/p2-profile/iot-core-profile/carbon.product

@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="4.4.16" useFeatures="true" includeLaunchers="true">
+version="4.4.17" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="4.4.16" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
    </features>
 
   <configurations>

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}
@@ -1017,10 +1010,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>
@@ -1627,11 +1616,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>
@@ -1649,12 +1633,12 @@
                                     <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>
                             </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>
 					
@@ -2063,10 +2047,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>
@@ -2493,10 +2473,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>
@@ -2718,14 +2694,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.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>
@@ -3127,10 +3095,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>

pom.xml

@@ -1446,7 +1446,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.16</carbon.kernel.version>
+        <carbon.kernel.version>4.4.17</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
         <carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
 
@@ -1516,18 +1516,15 @@
         <!-- Carbon Governance -->
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
-        <!-- Carbon Device Management -->
+        <!-- Carbon Device Management-->
-
+        <carbon.device.mgt.version>3.0.172</carbon.device.mgt.version>
-        <carbon.device.mgt.version>3.0.129-SNAPSHOT</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-SNAPSHOT</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.93</carbon.device.mgt.plugin.version>
-
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>
@@ -1763,6 +1760,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <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>

pull_request_template.md

@@ -0,0 +1,52 @@
+## Purpose
+> Describe the problems, issues, or needs driving this feature/fix and include links to related issues in the following format: Resolves issue1, issue2, etc.
+
+## Goals
+> Describe the solutions that this feature/fix will introduce to resolve the problems described above
+
+## Approach
+> Describe how you are implementing the solutions. Include an animated GIF or screenshot if the change affects the UI (email documentation@wso2.com to review all UI text). Include a link to a Markdown file or Google doc if the feature write-up is too long to paste here.
+
+## User stories
+> Summary of user stories addressed by this change>
+
+## Release note
+> Brief description of the new feature or bug fix as it will appear in the release notes
+
+## Documentation
+> Link(s) to product documentation that addresses the changes of this PR. If no doc impact, enter “N/A” plus brief explanation of why there’s no doc impact
+
+## Training
+> Link to the PR for changes to the training content in https://github.com/wso2/WSO2-Training, if applicable
+
+## Certification
+> Type “Sent” when you have provided new/updated certification questions, plus four answers for each question (correct answer highlighted in bold), based on this change. Certification questions/answers should be sent to certification@wso2.com and NOT pasted in this PR. If there is no impact on certification exams, type “N/A” and explain why.
+
+## Marketing
+> Link to drafts of marketing content that will describe and promote this feature, including product page changes, technical articles, blog posts, videos, etc., if applicable
+
+## Automation tests
+ - Unit tests 
+   > Code coverage information
+ - Integration tests
+   > Details about the test cases and coverage
+
+## Security checks
+ - Followed secure coding standards in http://wso2.com/technical-reports/wso2-secure-engineering-guidelines? yes/no
+ - Ran FindSecurityBugs plugin and verified report? yes/no
+ - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? yes/no
+
+## Samples
+> Provide high-level details about the samples related to this feature
+
+## Related PRs
+> List any other related PRs
+
+## Migrations (if applicable)
+> Describe migration steps and platforms on which migration has been tested
+
+## Test environment
+> List all JDK versions, operating systems, databases, and browser/versions on which this feature/fix was tested
+ 
+## Learning
+> Describe the research phase and any blog posts, patterns, libraries, or add-ons you used to solve the problem.