From dfbecaa8c219ffed92a8d7327b0236c4bcafcf95 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 8 Dec 2016 17:43:53 +0530
Subject: [PATCH 1/8] Adding separate tasks to carry out device monitoring for
 each device type

---
 .../src/repository/conf/cdm-config.xml         | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/core/distribution/src/repository/conf/cdm-config.xml b/modules/core/distribution/src/repository/conf/cdm-config.xml
index caa367a5..f575dde5 100644
--- a/modules/core/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/core/distribution/src/repository/conf/cdm-config.xml
@@ -45,23 +45,9 @@
         <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
     </PolicyConfiguration>
     <TaskConfiguration>
-        <Enable>false</Enable>
-        <Frequency>600000</Frequency>
+        <Enable>true</Enable>
+        <Frequency>30000</Frequency>
         <TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
-        <Operations>
-            <Operation>
-                <Name>DEVICE_INFO</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-            <Operation>
-                <Name>APPLICATION_LIST</Name>
-                <RecurrentTimes>5</RecurrentTimes>
-            </Operation>
-            <Operation>
-                <Name>DEVICE_LOCATION</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-        </Operations>
     </TaskConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>

From 042da62607a190f94c26ca304a3ecf5b994ffcf3 Mon Sep 17 00:00:00 2001
From: dunithd <dunithd@gmail.com>
Date: Thu, 8 Dec 2016 17:50:00 +0530
Subject: [PATCH 2/8] Upgrading analytics carbon.kernel.version to 4.4.10

---
 modules/analytics/distribution/pom.xml        |  22 +--
 .../distribution/src/assembly/bin.xml         | 134 +++++++++---------
 .../distribution/src/assembly/dist.xml        |   2 +-
 modules/analytics/p2-profile-gen/pom.xml      |  18 +--
 pom.xml                                       |   4 +-
 5 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml
index c12e7532..fb5bce85 100644
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@@ -69,7 +69,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon</groupId>
                                     <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernel.449.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -99,7 +99,7 @@
                                         <include name="${project.artifactId}-${project.version}.zip" />
                                     </fileset>
                                 </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components" overwrite="true">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
                                     <fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components">
                                     </fileset>
                                 </copy>
@@ -116,20 +116,20 @@
                             <tasks>
                                 <!-- commenting "GetAllRolesOfUserEnabled" property to fix
                               https://wso2.org/jira/browse/IDENTITY-3489 -->
-                                <replace file="target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
                                 <!-- Move IS UI to configure menu -->
                                 <property name="tempdir2" value="target/identity-ui" />
                                 <mkdir dir="${tempdir2}" />
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.user.mgt.ui_${identity.jar.version}.jar" dest="${tempdir2}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.user.mgt.ui_${identity.jar.version}.jar" dest="${tempdir2}" />
                                 <replace file="${tempdir2}/META-INF/component.xml" token="&lt;parent-menu&gt;identity_menu&lt;/parent-menu&gt;" value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;" />
-                                <zip destfile="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.user.mgt.ui_${identity.jar.version}.jar" basedir="${tempdir2}" />
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${identity.jar.version}.jar" dest="${tempdir3}" />
+                                <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.user.mgt.ui_${identity.jar.version}.jar" basedir="${tempdir2}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${identity.jar.version}.jar" dest="${tempdir3}" />
                                 <replace file="${tempdir3}/META-INF/component.xml" token="&lt;parent-menu&gt;identity_menu&lt;/parent-menu&gt;" value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;" />
-                                <zip destfile="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${identity.jar.version}.jar" basedir="${tempdir3}" />
-                                <unzip src="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.security.mgt.ui_${identity.jar.version}.jar" dest="${tempdir4}" />
+                                <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.user.store.configuration.ui_${identity.jar.version}.jar" basedir="${tempdir3}" />
+                                <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.security.mgt.ui_${identity.jar.version}.jar" dest="${tempdir4}" />
                                 <replace file="${tempdir4}/META-INF/component.xml" token="&lt;parent-menu&gt;manage_menu&lt;/parent-menu&gt;" value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;" />
-                                <zip destfile="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/plugins/org.wso2.carbon.security.mgt.ui_${identity.jar.version}.jar" basedir="${tempdir4}" />
-                                <concat destfile="target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/logging-bridge.properties" append="true" fixlastline="true">org.restlet.level=SEVERE
+                                <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.security.mgt.ui_${identity.jar.version}.jar" basedir="${tempdir4}" />
+                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-bridge.properties" append="true" fixlastline="true">org.restlet.level=SEVERE
                                 </concat>
                                 <delete dir="${tempdir4}" />
                                 <delete dir="${tempdir3}" />
@@ -149,7 +149,7 @@
                                 <delete dir="target/archive-tmp" />
                                 <delete dir="target/dependency-maven-plugin-markers" />
                                 <delete dir="target/maven-archiver" />
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.449.version}" />
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
                                 <delete file="target/${project.artifactId}-${project.version}.jar" />
                                 <delete dir="target/sources" />
                                 <delete dir="target/site" />
diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 176ff688..7f0aab89 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -24,7 +24,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.449.version}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/repository/deployment/server/axis2services/*</exclude>
@@ -49,7 +49,7 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.449.version}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/wso2server.bat</exclude>
@@ -62,7 +62,7 @@
         </fileSet>
         <!-- copying runtime-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/lib/runtimes</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/runtimes/</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -72,7 +72,7 @@
         <!-- Multitenancy related files -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
             <includes>
@@ -84,7 +84,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <includes>
@@ -117,7 +117,7 @@
         <!-- Analytics related config -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics</outputDirectory>
             <includes>
@@ -176,7 +176,7 @@
         <!-- Some war files related to CEP websockets -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/webapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
@@ -193,7 +193,7 @@
         <!-- Jaggery modules, carbon and process. Should be copied to <DAS_HOME> -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/modules
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules</outputDirectory>
             <includes>
@@ -204,7 +204,7 @@
         <!-- Shindig webapp. Should be copied to <DAS_HOME> -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/webapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
@@ -215,7 +215,7 @@
         <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/jaggeryapps/portal
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal
             </outputDirectory>
@@ -239,7 +239,7 @@
         <!-- Copying dbscripts related to metrics feature -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/dbscripts/metrics/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/metrics</outputDirectory>
             <includes>
@@ -262,13 +262,13 @@
 
         <!-- *********** Default files copy that comes with Carbon ************* -->
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/bin/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/bin/version.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -279,55 +279,55 @@
             <filtered>true</filtered>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/axis2/axis2.xml</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/README</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/lib/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/lib/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/components/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/components/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/database/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/database/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/logs/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/logs/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/logs/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.449.version}/repository/resources/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/resources/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -359,7 +359,7 @@
         <!-- ************* Data bridge related files ********** -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/data-bridge/data-bridge-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
             <filtered>true</filtered>
@@ -367,7 +367,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/data-bridge/data-agent-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge
             </outputDirectory>
@@ -379,7 +379,7 @@
         <!-- ************* tomcat webapp hosting related files start ********** -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/tomcat/webapp-classloading.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
@@ -387,7 +387,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/tomcat/webapp-classloading-environments.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
@@ -395,7 +395,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/tomcat/context.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
@@ -406,7 +406,7 @@
         <!-- Event broker configuration for deployment sync -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/event-broker.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
@@ -415,7 +415,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/output-event-adapters.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
             </outputDirectory>
@@ -425,7 +425,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/input-event-adapters.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/input-event-adapters.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
             </outputDirectory>
@@ -435,7 +435,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/cep/storm/storm.yaml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cep/storm/storm.yaml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/cep/storm/
             </outputDirectory>
@@ -444,7 +444,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/event-processor.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-processor.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
             </outputDirectory>
@@ -455,7 +455,7 @@
         <!-- Analytics datasources -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/datasources/analytics-datasources.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/analytics-datasources.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
             <filtered>true</filtered>
@@ -465,7 +465,7 @@
         <!-- Analytics REST APIs WebApp -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/webapps/analytics.war
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <!--commented since this tag causes issues in maven assembly plugin when copying zip formats-->
@@ -474,7 +474,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/logging-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/
             </outputDirectory>
@@ -482,7 +482,7 @@
 
         <!--loads spark environment variables-->
         <file>
-            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/load-spark-env-vars.sh-->
+            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/load-spark-env-vars.sh-->
             <!-- this file is moved to product-das from carbon-analytics DAS-110 -->
             <source>
                 src/bin/load-spark-env-vars.sh
@@ -493,7 +493,7 @@
             <fileMode>755</fileMode>
         </file>
         <file>
-            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/load-spark-env-vars.bat-->
+            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/load-spark-env-vars.bat-->
             <!-- this file is moved to product-das from carbon-analytics DAS-110 -->
             <source>
                 src/bin/load-spark-env-vars.bat
@@ -509,7 +509,7 @@
         <!-- Akka config files start -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/bundle-config/com.typesafe.config/reference.conf
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/com.typesafe.config/reference.conf
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/com.typesafe.config/
             </outputDirectory>
@@ -519,7 +519,7 @@
         <!--YARN conf files-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/bundle-config/hadoop-client/core-site.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/hadoop-client/core-site.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/hadoop-client/
             </outputDirectory>
@@ -528,7 +528,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/bundle-config/hadoop-client/hdfs-site.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/hadoop-client/hdfs-site.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/hadoop-client/
             </outputDirectory>
@@ -537,7 +537,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/bundle-config/hadoop-client/yarn-site.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/hadoop-client/yarn-site.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/hadoop-client/
             </outputDirectory>
@@ -546,7 +546,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/bundle-config/hadoop-client/mapred-site.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/hadoop-client/mapred-site.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/hadoop-client/
             </outputDirectory>
@@ -566,7 +566,7 @@
             <fileMode>755</fileMode>
         </file>
         <file>
-            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/wso2server.bat-->
+            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat-->
             <!-- this file is moved to product-das from carbon-analytics DAS-110 -->
             <source>
                 src/bin/wso2server.bat
@@ -580,7 +580,7 @@
         <!--spark defaults file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/spark/spark-defaults.conf
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-defaults.conf
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
             </outputDirectory>
@@ -590,7 +590,7 @@
         <!--spark fair scheduler xml file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/spark/fairscheduler.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/fairscheduler.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
             </outputDirectory>
@@ -600,7 +600,7 @@
         <!--spark classpath config file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/spark/external-spark-classpath.conf
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/external-spark-classpath.conf
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
             </outputDirectory>
@@ -608,7 +608,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/spark/carbon-spark-classpath.conf
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/carbon-spark-classpath.conf
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
             </outputDirectory>
@@ -618,7 +618,7 @@
         <!--spark udf conf file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/analytics/spark/spark-udf-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-udf-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
             </outputDirectory>
@@ -628,7 +628,7 @@
         <!-- analytics backup tool script file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/analytics-backup.sh
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/analytics-backup.sh
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/
             </outputDirectory>
@@ -636,7 +636,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/analytics-backup.bat
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/analytics-backup.bat
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
         </file>
@@ -644,7 +644,7 @@
         <!-- analytics cassandra migration tool script file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/analytics-migrate.sh
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/analytics-migrate.sh
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/
             </outputDirectory>
@@ -652,7 +652,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/analytics-migrate.bat
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/analytics-migrate.bat
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
         </file>
@@ -661,7 +661,7 @@
         <!-- CEP -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/cep/storm/storm.yaml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cep/storm/storm.yaml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/cep/storm/
             </outputDirectory>
@@ -671,7 +671,7 @@
         <!-- Including rdbms configuration file for event simulator -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/cep/rdbms-configuration.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cep/rdbms-configuration.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/cep
             </outputDirectory>
@@ -681,20 +681,20 @@
         <!-- Cipher Tool Files -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/ciphertool.sh
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.sh
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/bin/ciphertool.bat
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.bat
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
         </file>
@@ -723,21 +723,21 @@
         <!-- Copying metrics feature related files -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/metrics.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>false</filtered>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/metrics.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>false</filtered>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/datasources/metrics-datasources.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/
             </outputDirectory>
@@ -745,7 +745,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/database/WSO2METRICS_DB.h2.db
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
             <fileMode>644</fileMode>
@@ -754,14 +754,14 @@
         <!-- Copying the identity file -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/identity/identity.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml
             </source>
             <outputDirectory>wso2iot-analytics-${pom.version}/repository/conf/identity</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/jwt.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -769,7 +769,7 @@
         </file>
        <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/etc/websocket-validation.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -789,7 +789,7 @@
         <!-- Adding IoT Analytics Dashboard and gadget CApps -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
             <fileMode>644</fileMode>
@@ -797,7 +797,7 @@
         <!-- Adding Geo Dashboard  configuration files and Capp -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
             <fileMode>644</fileMode>
@@ -818,7 +818,7 @@
         </file>
        <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/conf/datasources/geodashboard-datasources.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/geodashboard-datasources.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
             <filtered>true</filtered>
diff --git a/modules/analytics/distribution/src/assembly/dist.xml b/modules/analytics/distribution/src/assembly/dist.xml
index ad717a0e..3e7b6aa3 100644
--- a/modules/analytics/distribution/src/assembly/dist.xml
+++ b/modules/analytics/distribution/src/assembly/dist.xml
@@ -25,7 +25,7 @@
     <fileSets>
       <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
-             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/components</directory>
+             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
             <outputDirectory>wso2iot-analytics-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index f3dcb010..69c46507 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -48,7 +48,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon</groupId>
                                     <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernel.449.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -144,13 +144,13 @@
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.das.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.449.version}
+                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.449.version}
+                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.449.version}
+                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.das:org.wso2.das.styles.feature:${product.das.version}
@@ -409,7 +409,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.449.version}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -482,15 +482,15 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.449.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.449.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.ui.feature.group</id>
-                                    <version>${carbon.kernel.449.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.das.styles.feature.group</id>
@@ -819,7 +819,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.449.version}/repository/components">
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
                                     <include name="**/bundles.info" />
                                 </replace>
                             </tasks>
diff --git a/pom.xml b/pom.xml
index 28c672e5..87d8c472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1561,7 +1561,7 @@
         <!-- Carbon Analytics Common (DAS) -->
         <carbon.analytics.common.version>5.1.5-SNAPSHOT</carbon.analytics.common.version>
         <carbon.analytics.version>1.3.0</carbon.analytics.version>
-        <carbon.analytics.das.version>1.2.7</carbon.analytics.das.version>
+        <carbon.analytics.das.version>1.3.0</carbon.analytics.das.version>
         <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>
@@ -1647,7 +1647,7 @@
         <orbit.version.h2>1.2.140.wso2v3</orbit.version.h2>
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
-        <carbon.dashboard.version>2.0.4-SNAPSHOT</carbon.dashboard.version>
+        <carbon.dashboard.version>2.0.4</carbon.dashboard.version>
         <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>

From 62f46a2cf8f2c7124402a58596d4603cee08c324 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 8 Dec 2016 17:52:46 +0530
Subject: [PATCH 3/8] Adding separate tasks to carry out device monitoring for
 each device type

---
 modules/core/distribution/src/repository/conf/cdm-config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/distribution/src/repository/conf/cdm-config.xml b/modules/core/distribution/src/repository/conf/cdm-config.xml
index f575dde5..54c40259 100644
--- a/modules/core/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/core/distribution/src/repository/conf/cdm-config.xml
@@ -46,7 +46,7 @@
     </PolicyConfiguration>
     <TaskConfiguration>
         <Enable>true</Enable>
-        <Frequency>30000</Frequency>
+        <Frequency>60000</Frequency>
         <TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
     </TaskConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->

From 0e13ffc9916e7f06a8424c77d8a0f6c54f8feb21 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Fri, 9 Dec 2016 01:32:56 +0530
Subject: [PATCH 4/8] Bump versions to released component versions

---
 .../distribution/src/resources/plugins/plugins-deployer.xml | 4 ++--
 pom.xml                                                     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml
index c81ed0de..de281de6 100644
--- a/modules/distribution/src/resources/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.iot.devicemgt-plugins</groupId>
     <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-ALPHA5</version>
     <packaging>pom</packaging>
     <name>Creating custom distribution</name>
     <url>http://wso2.org</url>
@@ -225,6 +225,6 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.3-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 87d8c472..a2dcba1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1542,14 +1542,14 @@
         <carbon.governance.version>4.6.5</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.3</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.3-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
@@ -1656,7 +1656,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.8-SNAPSHOT</appmgt.feature.version>
+        <appmgt.feature.version>1.2.8</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>

From 80bfd669d2d80d045dbeafe72bec35c7948b1cf0 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <builder@wso2.org>
Date: Fri, 9 Dec 2016 06:27:54 +0000
Subject: [PATCH 5/8] [maven-release-plugin] prepare release v1.0.0-ALPHA5

---
 modules/analytics/distribution/pom.xml                      | 2 +-
 modules/analytics/p2-profile-gen/pom.xml                    | 2 +-
 modules/analytics/pom.xml                                   | 2 +-
 modules/broker/distribution/pom.xml                         | 2 +-
 modules/broker/p2-profile/pom.xml                           | 2 +-
 modules/broker/pom.xml                                      | 2 +-
 modules/core/distribution/pom.xml                           | 2 +-
 .../core/features/org.wso2.iot.core.styles.feature/pom.xml  | 2 +-
 modules/core/features/pom.xml                               | 2 +-
 modules/core/iotserver-ui/pom.xml                           | 2 +-
 modules/core/p2-profile-gen/pom.xml                         | 2 +-
 modules/core/pom.xml                                        | 2 +-
 modules/core/tools/cdmf-devicetype-archetype/pom.xml        | 4 ++--
 modules/core/tools/pom.xml                                  | 2 +-
 modules/distribution/pom.xml                                | 2 +-
 pom.xml                                                     | 6 +++---
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml
index fb5bce85..ba6e219e 100644
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index 69c46507..f8ad378a 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml
index 67cb5851..fe0ab6bd 100644
--- a/modules/analytics/pom.xml
+++ b/modules/analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml
index 090a9eeb..31b5e9d9 100644
--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml
index 66366263..4b9298e3 100644
--- a/modules/broker/p2-profile/pom.xml
+++ b/modules/broker/p2-profile/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml
index aba78ca6..12981822 100644
--- a/modules/broker/pom.xml
+++ b/modules/broker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml
index 9effc12d..9c4e8a16 100644
--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-core-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-ALPHA5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
index 36ced06b..3664501e 100644
--- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-features</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml
index e336bd71..57fa7b81 100644
--- a/modules/core/features/pom.xml
+++ b/modules/core/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml
index 0d0d4ca5..ec76e8ed 100644
--- a/modules/core/iotserver-ui/pom.xml
+++ b/modules/core/iotserver-ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 3c357371..beb36a8d 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 52464c0e..a44a4791 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
index bff5eb86..8a3a6c76 100644
--- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-tools</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-devicetype-archetype</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-ALPHA5</version>
     <name>WSO2 IoT - Device Type Archetype</name>
     <description>WSO2 IoT Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml
index 27585f27..4dc92d8a 100644
--- a/modules/core/tools/pom.xml
+++ b/modules/core/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 95e2bdb1..8794ecca 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-ALPHA5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a2dcba1d..14075b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.iot</groupId>
     <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-ALPHA5</version>
     <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
@@ -1546,7 +1546,7 @@
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
-        <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
+        <product.iot.version>1.0.0-ALPHA5</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
         <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
@@ -1696,7 +1696,7 @@
         <url>https://github.com/wso2/product-iots.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-iots.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-iots.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.0.0-ALPHA5</tag>
     </scm>
 
     <build>

From 412f912ca302fe7b9409a90a0aa4f5f962483654 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <builder@wso2.org>
Date: Fri, 9 Dec 2016 06:30:04 +0000
Subject: [PATCH 6/8] [maven-release-plugin] prepare for next development
 iteration

---
 modules/analytics/distribution/pom.xml                      | 2 +-
 modules/analytics/p2-profile-gen/pom.xml                    | 2 +-
 modules/analytics/pom.xml                                   | 2 +-
 modules/broker/distribution/pom.xml                         | 2 +-
 modules/broker/p2-profile/pom.xml                           | 2 +-
 modules/broker/pom.xml                                      | 2 +-
 modules/core/distribution/pom.xml                           | 2 +-
 .../core/features/org.wso2.iot.core.styles.feature/pom.xml  | 2 +-
 modules/core/features/pom.xml                               | 2 +-
 modules/core/iotserver-ui/pom.xml                           | 2 +-
 modules/core/p2-profile-gen/pom.xml                         | 2 +-
 modules/core/pom.xml                                        | 2 +-
 modules/core/tools/cdmf-devicetype-archetype/pom.xml        | 4 ++--
 modules/core/tools/pom.xml                                  | 2 +-
 modules/distribution/pom.xml                                | 2 +-
 pom.xml                                                     | 6 +++---
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml
index ba6e219e..fb5bce85 100644
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index f8ad378a..69c46507 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml
index fe0ab6bd..67cb5851 100644
--- a/modules/analytics/pom.xml
+++ b/modules/analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml
index 31b5e9d9..090a9eeb 100644
--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml
index 4b9298e3..66366263 100644
--- a/modules/broker/p2-profile/pom.xml
+++ b/modules/broker/p2-profile/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml
index 12981822..aba78ca6 100644
--- a/modules/broker/pom.xml
+++ b/modules/broker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml
index 9c4e8a16..9effc12d 100644
--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-core-parent</artifactId>
-		<version>1.0.0-ALPHA5</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
index 3664501e..36ced06b 100644
--- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-features</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml
index 57fa7b81..e336bd71 100644
--- a/modules/core/features/pom.xml
+++ b/modules/core/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml
index ec76e8ed..0d0d4ca5 100644
--- a/modules/core/iotserver-ui/pom.xml
+++ b/modules/core/iotserver-ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index beb36a8d..3c357371 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index a44a4791..52464c0e 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
index 8a3a6c76..bff5eb86 100644
--- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-tools</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-devicetype-archetype</artifactId>
-    <version>1.0.0-ALPHA5</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>WSO2 IoT - Device Type Archetype</name>
     <description>WSO2 IoT Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml
index 4dc92d8a..27585f27 100644
--- a/modules/core/tools/pom.xml
+++ b/modules/core/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 8794ecca..95e2bdb1 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>1.0.0-ALPHA5</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 14075b69..a2dcba1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.iot</groupId>
     <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-ALPHA5</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
@@ -1546,7 +1546,7 @@
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
-        <product.iot.version>1.0.0-ALPHA5</product.iot.version>
+        <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
         <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
@@ -1696,7 +1696,7 @@
         <url>https://github.com/wso2/product-iots.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-iots.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-iots.git</connection>
-        <tag>v1.0.0-ALPHA5</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <build>

From ec2a28d0976c43d0e278175013fc113d15cb4293 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Fri, 9 Dec 2016 13:12:41 +0530
Subject: [PATCH 7/8] Bump versions to next development iteration

---
 .../distribution/src/resources/plugins/plugins-deployer.xml  | 4 ++--
 pom.xml                                                      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml
index de281de6..3e5c2860 100644
--- a/modules/distribution/src/resources/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.iot.devicemgt-plugins</groupId>
     <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>1.0.0-ALPHA5</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Creating custom distribution</name>
     <url>http://wso2.org</url>
@@ -225,6 +225,6 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a2dcba1d..5b90e548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1474,7 +1474,6 @@
 
         <!--Carbon kernel versions-->
         <carbon.kernel.version>4.4.10</carbon.kernel.version>
-        <carbon.kernel.449.version>4.4.9</carbon.kernel.449.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1542,14 +1541,14 @@
         <carbon.governance.version>4.6.5</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.3</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.4-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.3</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>

From fc821e1cab493fd53c224f0cef1798b3eb8ce4d8 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 9 Dec 2016 19:02:19 +0530
Subject: [PATCH 8/8] Changing SSO login page into /devicemgt/login

---
 modules/core/distribution/src/assembly/bin.xml    | 15 ++++++---------
 .../conf/identity/application-authentication.xml  |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 4ed31f2b..0892cc94 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -822,15 +822,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
@@ -851,6 +842,12 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/identity/application-authentication.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
+            </outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>src/repository/conf/identity/thrift-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
index 2139b873..873810cf 100644
--- a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
+++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
@@ -29,8 +29,8 @@
         AuthenticationEndpointURL is location of the web app containing
         the authentication related pages
     -->
-    <AuthenticationEndpointURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login</AuthenticationEndpointURL>
-    <AuthenticationEndpointRetryURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login?retry=true</AuthenticationEndpointRetryURL>
+    <AuthenticationEndpointURL>/devicemgt/login</AuthenticationEndpointURL>
+    <AuthenticationEndpointRetryURL>/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
 
     <!--
         Extensions allow extending the default behaviour of the authentication