From 36358ea0b2883c7d55618a9065cc8680c6c4167c Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Sat, 31 Jan 2015 22:31:09 +0530
Subject: [PATCH] More pom clean-ups

---
 .../org.wso2.carbon.policy.mgt.server.feature/pom.xml |  6 +++---
 pom.xml                                               |  2 +-
 product/modules/p2-profile-gen/pom.xml                | 11 ++---------
 3 files changed, 6 insertions(+), 13 deletions(-)

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 37083af062..cb30ba7712 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
@@ -99,11 +99,11 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.core:${project.version}
+                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.common:${project.version}
+                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.evaluator:${project.version}
+                                <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.evaluator:${carbon.device.mgt.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
diff --git a/pom.xml b/pom.xml
index b14ee61508..f6a21584a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,7 +809,7 @@
         <carbon.deployment.version>4.3.0-SNAPSHOT</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>4.3.0-SNAPSHOT</carbon.identity.version>
+        <carbon.identity.version>4.3.0</carbon.identity.version>
 
         <!-- Multi-tenancy -->
         <carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index a071c7e792..30140b1d9f 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -156,9 +156,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.commons:org.wso2.carbon.event.common.feature:${carbon.commons.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -181,7 +178,7 @@
 
                                 <!-- Identity Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
                                 <!--featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -350,10 +347,6 @@
                                     <id>org.wso2.carbon.event.server.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.event.common.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -381,7 +374,7 @@
                                 <!-- Identity Features -->
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.platform.version}</version>
                                 </feature>
                                 <!--feature>
                                     <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>