From 84fbde538e2e03bd9d50046c6522212c3de6d957 Mon Sep 17 00:00:00 2001
From: Geeth Munasinghe <geeth@wso2.com>
Date: Fri, 6 Feb 2015 20:27:32 +0530
Subject: [PATCH] Fixing pom issues for release works

---
 .../org.wso2.carbon.device.mgt.common/pom.xml |   6 +-
 .../org.wso2.carbon.device.mgt.core/pom.xml   |   6 +-
 components/device-mgt/pom.xml                 |   4 +-
 components/key-mgt/pom.xml                    |  57 ----
 .../org.wso2.carbon.policy.evalutor/pom.xml   |   6 +-
 .../org.wso2.carbon.policy.mgt.common/pom.xml |   6 +-
 .../org.wso2.carbon.policy.mgt.core/pom.xml   |   6 +-
 components/policy-mgt/pom.xml                 |  23 +-
 .../pom.xml                                   |   4 +-
 features/device-mgt/pom.xml                   |   4 +-
 .../pom.xml                                   |   4 +-
 features/policy-mgt/pom.xml                   |   4 +-
 pom.xml                                       |  12 +-
 product/modules/distribution/pom.xml          |  16 +-
 .../modules/distribution/src/assembly/bin.xml | 259 +++++++++---------
 .../distribution/src/assembly/dist.xml        |   2 +-
 product/modules/integration/pom.xml           |   2 +-
 .../tests-common/admin-clients/pom.xml        |   2 +-
 .../integration-test-utils/pom.xml            |   2 +-
 .../modules/integration/tests-common/pom.xml  |   2 +-
 .../integration/tests-common/ui-pages/pom.xml |   2 +-
 .../integration/tests-ui-integration/pom.xml  |  12 +-
 product/modules/p2-profile-gen/pom.xml        |  26 +-
 product/pom.xml                               |   2 +-
 24 files changed, 189 insertions(+), 280 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
index 71e962815a..de07f2c596 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.cdm</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Management Commons</name>
     <description>WSO2 Carbon - Device Management Commons</description>
@@ -26,7 +26,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
                         <Bundle-Description>Device Management Common Bundle</Bundle-Description>
                         <Export-Package>
                             org.wso2.carbon.device.mgt.common.*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 26d6316d5f..976cf73065 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Management Core</name>
     <description>WSO2 Carbon - Device Management Core</description>
@@ -49,7 +49,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
                         <Bundle-Description>Device Management Core Bundle</Bundle-Description>
                         <Private-Package>org.wso2.carbon.device.mgt.core.internal</Private-Package>
                         <Import-Package>
diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml
index c3c34e6292..0b2464c142 100644
--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>wso2cdm-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>device-mgt</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Component</name>
     <url>http://wso2.org</url>
diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml
index 85c04889a9..a4815da4ab 100644
--- a/components/key-mgt/pom.xml
+++ b/components/key-mgt/pom.xml
@@ -40,58 +40,6 @@
         <module>org.wso2.carbon.key.mgt.handler.valve</module>
     </modules>
 
-<!--
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>3.8.1.v20120830-144521</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.common</artifactId>
-                <version>3.6.100.v20120522-1841</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>4.3.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi.services</artifactId>
-                <version>3.3.100.v20120522-1822</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.apimgt.core</artifactId>
-                <version>${apim.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
-                <version>${apim.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.wso2</groupId>
-                <artifactId>tomcat</artifactId>
-                <version>${orbit.version.tomcat}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
-                <version>4.3.0-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
--->
-
     <build>
         <pluginManagement>
             <plugins>
@@ -111,9 +59,4 @@
             </plugins>
         </pluginManagement>
     </build>
-<!--    <properties>
-        <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
-        <apim.version>1.2.1</apim.version>
-        <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
-    </properties>-->
 </project>
diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
index 8a78c664f7..3a1b14ae33 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>org.wso2.carbon.policy.evaluator</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>
@@ -48,7 +48,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
                         <Bundle-Description>Policy Management Common Bundle</Bundle-Description>
                         <Private-Package>org.wso2.carbon.policy.evaluator</Private-Package>
                         <Export-Package>
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
index 4862a476a9..cc0d8152e4 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>
@@ -48,7 +48,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
                         <Bundle-Description>Policy Management Common Bundle</Bundle-Description>
                         <Private-Package>org.wso2.carbon.policy.mgt.common.internal</Private-Package>
                         <Import-Package>
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
index a1bf7752c7..dbe35fd675 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>
@@ -48,7 +48,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
                         <Bundle-Description>Policy Management Core Bundle</Bundle-Description>
                         <Private-Package>org.wso2.carbon.policy.mgt.core.internal</Private-Package>
                         <Import-Package>
diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml
index 11035528d8..c108cd86a2 100644
--- a/components/policy-mgt/pom.xml
+++ b/components/policy-mgt/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>wso2cdm-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>policy-mgt</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>
@@ -39,25 +39,6 @@
         <module>org.wso2.carbon.policy.evalutor</module>
     </modules>
 
-<!--    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>3.8.1.v20120830-144521</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.common</artifactId>
-                <version>3.6.100.v20120522-1841</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>4.3.0-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>-->
 
     <build>
         <pluginManagement>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index 96f634fbd9..d4c1221e1c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Devvice Management functionality
diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml
index b2c9606964..6f77685193 100644
--- a/features/device-mgt/pom.xml
+++ b/features/device-mgt/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>wso2cdm-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>device-mgt-feature</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
index b03e34c84c..39ce627286 100644
--- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
+++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>policy-mgt-feature</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>WSO2 Carbon - Policy Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Devvice Management functionality
diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml
index d2c9582b70..10085acb8a 100644
--- a/features/policy-mgt/pom.xml
+++ b/features/policy-mgt/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>wso2cdm-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>policy-mgt-feature</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Feature</name>
     <url>http://wso2.org</url>
diff --git a/pom.xml b/pom.xml
index 12790a91ab..8c556f36c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.carbon.cdm</groupId>
     <artifactId>wso2cdm-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>WSO2 CDM - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Connected Device Manager</description>
@@ -780,9 +780,6 @@
         <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
         <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
 
-        <!-- API Manager -->
-        <apim.version>1.2.4</apim.version>
-
         <!-- Carbon Commons -->
         <carbon.commons.version>4.3.4</carbon.commons.version>
 
@@ -790,7 +787,7 @@
         <carbon.deployment.version>4.3.1</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>4.3.2</carbon.identity.version>
+        <carbon.identity.version>4.3.3</carbon.identity.version>
 
         <!-- Multi-tenancy -->
         <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
@@ -802,7 +799,10 @@
         <carbon.governance.version>4.3.0</carbon.governance.version>
 
         <!-- Device Management -->
-        <carbon.device.mgt.version>1.0.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
+
+        <!--CDM version-->
+        <carbon.cdm.version>1.0.0-SNAPSHOT</carbon.cdm.version>
 
     </properties>
 
diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml
index 61cd1f67c3..e2e4005a6a 100644
--- a/product/modules/distribution/pom.xml
+++ b/product/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>wso2cdmserver-product</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -190,16 +190,16 @@
                                 <!--<property name="shindig.version" value="2.5.0-beta5" />-->
 
                                 <mkdir dir="${tempdir}" />
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/components" />
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server" />
-                                <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server/webapps" />
+                                <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/components" />
+                                <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/deployment/server" />
+                                <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/deployment/server/webapps" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2cdm-${project.version}.zip" />
+                                        <include name="wso2cdm-${carbon.cdm.version}.zip" />
                                     </fileset>
                                 </unzip>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
-                                    <fileset dir="${tempdir}/wso2cdm-${project.version}/repository/components" />
+                                    <fileset dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/components" />
                                 </copy>
                                 <!--testing -->
                                 <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
@@ -219,7 +219,7 @@
                                     og4j.logger.net.sf.ehcache=ERROR
                                 </concat>
 
-                                <delete file="target/wso2cdm-${project.version}.zip" />
+                                <delete file="target/wso2cdm-${carbon.cdm.version}.zip" />
                                 <delete dir="${tempdir}" />
                             </tasks>
                         </configuration>
@@ -260,7 +260,7 @@
                                 <delete dir="target/maven-archiver" />
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
-                                <delete file="target/wso2cdm-${project.version}.jar" />
+                                <delete file="target/wso2cdm-${carbon.cdm.version}.jar" />
                                 <delete dir="target/sources" />
                                 <delete dir="target/site" />
                                 <delete dir="target/antrun" />
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index f857b2b9ad..a73ad5d100 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -8,35 +8,39 @@
     <fileSets>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
-            <!--           <excludes>
-                           <exclude>**/*.sh</exclude>
-                           <exclude>**/README*</exclude>
-                           <exclude>**/LICENSE*</exclude>
-                           <exclude>**/INSTALL*</exclude>
-                           <exclude>**/release-notes.html</exclude>
-                           <exclude>**/axis2services/sample01.aar</exclude>
-                           <exclude>**/axis2services/echo/**</exclude>
-                           <exclude>**/axis2services/version/**</exclude>
-                           <exclude>**/pom.xml</exclude>
-                           <exclude>**/version.txt</exclude>
-                           <exclude>**/axis2/axis2.xml</exclude>
-                           <exclude>**/master-datasources.xml</exclude>
-                       </excludes>-->
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
+            <excludes>
+                <exclude>**/*.sh</exclude>
+                <exclude>**/README*</exclude>
+                <exclude>**/LICENSE*</exclude>
+                <exclude>**/INSTALL*</exclude>
+                <exclude>**/release-notes.html</exclude>
+                <exclude>**/axis2services/sample01.aar</exclude>
+                <exclude>**/axis2services/echo/**</exclude>
+                <exclude>**/axis2services/version/**</exclude>
+                <exclude>**/pom.xml</exclude>
+                <exclude>**/version.txt</exclude>
+                <!--<exclude>**/axis2/axis2.xml</exclude>-->
+                <exclude>**/master-datasources.xml</exclude>
+                <exclude>**/carbon.xml</exclude>
+                <exclude>**/database/WSO2DM_DB.h2.db</exclude>
+                <exclude>**/client-truststore.jks</exclude>
+                <exclude>**/wso2carbon.jks</exclude>
+            </excludes>
         </fileSet>
         <!--copying runtimes-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
             </directory>
-            <outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/lib/runtimes/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
             </includes>
@@ -48,7 +52,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/multitenancy
             </outputDirectory>
             <includes>
                 <include>**/stratos.xml</include>
@@ -62,7 +66,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/tenant-mgt.xml</include>
             </includes>
@@ -70,7 +74,7 @@
 
         <fileSet>
             <directory>src/repository/resources/styles/css</directory>
-            <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/resources/allthemes/Default/admin
             </outputDirectory>
             <includes>
                 <include>**/**.css</include>
@@ -78,7 +82,7 @@
         </fileSet>
         <fileSet>
             <directory>src/repository/resources/styles/images</directory>
-            <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/resources/allthemes/Default/images
             </outputDirectory>
             <includes>
                 <include>**/**.gif</include>
@@ -89,19 +93,19 @@
         <!-- copy documentation -->
         <fileSet>
             <directory>target/site</directory>
-            <outputDirectory>wso2cdm-${project.version}/docs</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/docs</outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
         <!-- copy the landing page webapp -->
         <!-- <fileSet>
              <directory>src/repository/resources/stratos_root</directory>
-             <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
+             <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
              <fileMode>755</fileMode>
          </fileSet>-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
             </directory>
-            <outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -109,7 +113,7 @@
 
         <fileSet>
             <directory>src/repository/conf</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/api-manager.xml</include>
                 <include>**/sso-idp-config.xml</include>
@@ -120,7 +124,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security/</outputDirectory>
             <includes>
                 <include>**/entitlement.properties</include>
                 <include>**/trusted-idp-config.xml</include>
@@ -128,7 +132,7 @@
         </fileSet>
         <fileSet>
             <directory>src/repository/conf/datasources</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/datasources
             </outputDirectory>
             <includes>
                 <include>**/master-datasources.xml</include>
@@ -137,7 +141,7 @@
         </fileSet>
         <fileSet>
             <directory>src/repository/resources</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/resources</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/resources</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -145,24 +149,15 @@
         <!--data-bridge configuration-->
         <fileSet>
             <directory>src/repository/conf/data-bridge</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/data-bridge
             </outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
-            </directory>
-            <outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/service-provider</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -173,18 +168,18 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/identity</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
 
-	<!-- Copying API management related dbscripts -->
+        <!-- Copying API management related dbscripts -->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/apimgt</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/apimgt</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -194,7 +189,7 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
             </directory>
-            <outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -203,7 +198,7 @@
         <!-- Copying Device Management related dbscripts -->
         <fileSet>
             <directory>../distribution/src/repository/dbscripts/cdm</directory>
-            <outputDirectory>wso2cdm-${project.version}/dbscripts/cdm</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/cdm</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -212,29 +207,29 @@
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
             </directory>
-            <outputDirectory>${project.artifactId}-${project.version}/repository/resources
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/resources
             </outputDirectory>
         </fileSet>
         <!-- copy cdm jaggery app
         Commented the section since the repo was moved to MDM
         -->
         <!--<fileSet>-->
-            <!--<directory>src/repository/jaggeryapps</directory>-->
-            <!--<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
+        <!--<directory>src/repository/jaggeryapps</directory>-->
+        <!--<outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/server/jaggeryapps-->
+        <!--</outputDirectory>-->
+        <!--<fileMode>755</fileMode>-->
         <!--</fileSet>-->
     </fileSets>
-    
+
     <dependencySets>
         <dependencySet>
-            <outputDirectory>wso2cdm-${project.version}/lib/endorsed</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/lib/endorsed</outputDirectory>
             <includes>
                 <include>javax.el:el-api:jar</include>
             </includes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>wso2cdm-${project.version}/repository/deployment/client/modules
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/client/modules
             </outputDirectory>
             <includes>
                 <include>org.hibernate.wso2:hibernate:jar</include>
@@ -244,23 +239,23 @@
     </dependencySets>
 
     <files>
- <!--       <file>
-            <source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source>
-            <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../rest-api/target/wso2cdm-api.war</source>
-            <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>-->
+        <!--       <file>
+                   <source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source>
+                   <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
+                   </outputDirectory>
+                   <fileMode>755</fileMode>
+               </file>
+               <file>
+                   <source>../rest-api/target/wso2cdm-api.war</source>
+                   <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
+                   </outputDirectory>
+                   <fileMode>755</fileMode>
+               </file>-->
         <!-- <file>
              <source>
                  ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
              </source>
-             <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
+             <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
              <filtered>true</filtered>
              <fileMode>644</fileMode>
          </file>
@@ -268,57 +263,57 @@
              <source>
                  ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
              </source>
-             <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
+             <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
              <filtered>true</filtered>
              <fileMode>644</fileMode>
          </file>-->
         <file>
             <source>src/repository/conf/tomcat/context.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <!--        <file>
                     <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
                     </source>
-                    <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
+                    <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
                     <filtered>true</filtered>
                     <fileMode>644</fileMode>
                 </file>-->
 
         <file>
             <source>INSTALL.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>README.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>LICENSE.txt</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>release-notes.html</source>
-            <outputDirectory>wso2cdm-${project.version}</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
-            <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
-            <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -328,7 +323,7 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -338,60 +333,60 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
 
         <!-- Copying application-authentication.xml -->
-<!--
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
-            </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
--->
+        <!--
+                <file>
+                    <source>
+                        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
+                    </source>
+                    <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security</outputDirectory>
+                    <filtered>true</filtered>
+                    <fileMode>644</fileMode>
+                </file>
+        -->
 
         <!-- Copying thrift-authentication.xml -->
-<!--        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
-            </source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>-->
+        <!--        <file>
+                    <source>
+                        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
+                    </source>
+                    <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
+                    <filtered>true</filtered>
+                    <fileMode>644</fileMode>
+                </file>-->
 
         <file>
             <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/multitenancy/
             </outputDirectory>
             <filtered>true</filtered>
         </file>
         <!--<file>
             <source>src/repository/conf/axis2/axis2.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/axis2/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>-->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
 
@@ -399,7 +394,7 @@
             <source>
                 ../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>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat
             </outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -410,65 +405,65 @@
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
 
         <!--cdm plugin config file-->
-<!--        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
-            </source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>-->
+        <!--        <file>
+                    <source>
+                        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
+                    </source>
+                    <outputDirectory>
+                        ${wso2cdm}-${carbon.cdm.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
+                    </outputDirectory>
+                    <filtered>true</filtered>
+                    <fileMode>644</fileMode>
+                </file>-->
         <file>
             <source>
                 ../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>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat
             </outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
 
-	<!-- Copying H2 database related files corresponding to default API management repository schema -->
-<!--	<file>
-            <source>
-                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db
-	    </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>WSO2AM_DB.h2.db</destName>
-            <fileMode>644</fileMode>
-        </file>-->
+        <!-- Copying H2 database related files corresponding to default API management repository schema -->
+        <!--	<file>
+                    <source>
+                        target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db
+                </source>
+                    <outputDirectory>${pom.artifactId}-${carbon.cdm.version}/repository/database</outputDirectory>
+                    <destName>WSO2AM_DB.h2.db</destName>
+                    <fileMode>644</fileMode>
+                </file>-->
 
-	<!-- Copying H2 database related files corresponding to default Device management repository schema -->
+        <!-- Copying H2 database related files corresponding to default Device management repository schema -->
         <file>
             <source>
                 target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/database</outputDirectory>
             <destName>WSO2DM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
 
         <!-- Copying H2 database related files corresponding to default Mobile Device management repository schema -->
-  <!--      <file>
-            <source>
-                ../distribution/src/repository/database/WSO2MobileDM_DB.h2.db
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>WSO2MobileDM_DB.h2.db</destName>
-            <fileMode>644</fileMode>
-        </file> -->
+        <!--      <file>
+                  <source>
+                      ../distribution/src/repository/database/WSO2MobileDM_DB.h2.db
+                  </source>
+                  <outputDirectory>${pom.artifactId}-${carbon.cdm.version}/repository/database</outputDirectory>
+                  <destName>WSO2MobileDM_DB.h2.db</destName>
+                  <fileMode>644</fileMode>
+              </file> -->
 
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
 
diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml
index d0a9a55a8d..fffd28740a 100644
--- a/product/modules/distribution/src/assembly/dist.xml
+++ b/product/modules/distribution/src/assembly/dist.xml
@@ -26,7 +26,7 @@
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-            <outputDirectory>wso2cdm-${project.version}/repository/components</outputDirectory>
+            <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
                 <exclude>**/*.lock</exclude>
diff --git a/product/modules/integration/pom.xml b/product/modules/integration/pom.xml
index f4a8adedf4..7e183eb0f3 100644
--- a/product/modules/integration/pom.xml
+++ b/product/modules/integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>wso2cdmserver-product</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml
index c12dc222e1..8f9fe7f500 100644
--- a/product/modules/integration/tests-common/admin-clients/pom.xml
+++ b/product/modules/integration/tests-common/admin-clients/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/product/modules/integration/tests-common/integration-test-utils/pom.xml b/product/modules/integration/tests-common/integration-test-utils/pom.xml
index e9373c65cd..b8c1e6a17f 100644
--- a/product/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/product/modules/integration/tests-common/pom.xml b/product/modules/integration/tests-common/pom.xml
index af87da1aba..68ef64d28e 100644
--- a/product/modules/integration/tests-common/pom.xml
+++ b/product/modules/integration/tests-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>wso2cdm-integration</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml
index 2b4393b6dc..50ffb3d4ee 100644
--- a/product/modules/integration/tests-common/ui-pages/pom.xml
+++ b/product/modules/integration/tests-common/ui-pages/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>cdm-integration-tests-common</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/product/modules/integration/tests-ui-integration/pom.xml b/product/modules/integration/tests-ui-integration/pom.xml
index 38af4424a6..85ef2ee3f8 100644
--- a/product/modules/integration/tests-ui-integration/pom.xml
+++ b/product/modules/integration/tests-ui-integration/pom.xml
@@ -62,7 +62,7 @@
                         <property>
                             <name>carbon.zip</name>
                             <value>
-                                ${basedir}/../../distribution/target/wso2emm-${project.version}.zip
+                                ${basedir}/../../distribution/target/wso2emm-${carbon.cdm.version}.zip
                             </value>
                         </property>
                         <property>
@@ -132,7 +132,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.emm</groupId>
                                     <artifactId>wso2emm</artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${carbon.cdm.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${basedir}/target/tobeCopied/</outputDirectory>
@@ -171,7 +171,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -192,7 +192,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -213,7 +213,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/conf/axis2/
+                                        ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/conf/axis2/
                                     </directory>
                                     <includes>
                                         <include>**/*.xml</include>
@@ -234,7 +234,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/deployment/client/modules
+                                        ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/deployment/client/modules
                                     </directory>
                                     <includes>
                                         <include>**/*.mar</include>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index b326e6b438..59a501b243 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>wso2cdmserver-product</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -166,9 +166,9 @@
                                 -->
 
                                 <!-- Multitenancy Features -->
-                                <!--featureArtifactDef>
+                               <!-- <featureArtifactDef>
                                     org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
-                                </featureArtifactDef-->
+                                </featureArtifactDef>-->
                                 <!-- End of Multitenancy Features -->
 
                                 <!-- Identity Features -->
@@ -271,10 +271,7 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-                                <!--<feature>
-                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
-                                    <version>${carbon.platform.version}</version>
-                                </feature>-->
+
 
                                 <!-- Device Management Features -->
                                 <feature>
@@ -323,10 +320,10 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
-                                <feature>
+                                <!--<feature>
                                     <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
-                                </feature>
+                                </feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
@@ -351,18 +348,11 @@
                                 </feature>
                                  <!--End of Carbon Commons Features-->
 
-                                <!-- API Manager Features -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.apimgt.core.feature.group</id>-->
-                                    <!--<version>${carbon.platform.version}</version>-->
-                                <!--</feature>-->
-                                <!-- End of API Manager Features -->
-
                                 <!-- Carbon Multitenancy Features -->
-                                <!--feature>
+                                <!--<feature>
                                     <id>org.wso2.carbon.tenant.common.server.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
-                                </feature-->
+                                </feature>-->
                                 <!-- End of Carbon Multitenancy Features -->
 
                                 <!-- Identity Features -->
diff --git a/product/pom.xml b/product/pom.xml
index 3dd34dae34..e81d15230f 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.cdm</groupId>
         <artifactId>wso2cdm-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>