From 65fa0fcd6193bdda0dd9f51e43ddd55d717a7e2e Mon Sep 17 00:00:00 2001
From: harshanL <harshan@wso2.com>
Date: Mon, 2 Feb 2015 21:49:24 +0530
Subject: [PATCH] Fixed the issues in build

---
 .../org.wso2.carbon.device.mgt.core/pom.xml   |  2 +-
 pom.xml                                       | 24 +++++-------
 .../tests-common/admin-clients/pom.xml        |  4 +-
 .../integration-test-utils/pom.xml            |  4 +-
 .../integration/tests-common/ui-pages/pom.xml |  4 +-
 product/modules/p2-profile-gen/pom.xml        | 39 ++++++++++---------
 6 files changed, 37 insertions(+), 40 deletions(-)

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 1d426a62197..3c28bb751eb 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
@@ -139,7 +139,7 @@
             <artifactId>org.wso2.carbon.user.api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
+            <groupId>org.wso2.carbon.governance</groupId>
             <artifactId>org.wso2.carbon.governance.api</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 9fdb630f024..952963d3c90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@
                 <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
+                <groupId>org.wso2.carbon.governance</groupId>
                 <artifactId>org.wso2.carbon.governance.api</artifactId>
                 <version>${carbon.governance.version}</version>
                 <exclusions>
@@ -575,9 +575,9 @@
     </dependencyManagement>
 
     <scm>
-        <url>https://github.com/wso2/product-mdm.git</url>
-        <developerConnection>scm:git:https://github.com/wso2/product-mdm.git</developerConnection>
-        <connection>scm:git:https://github.com/wso2/product-mdm.git</connection>
+        <url>https://github.com/wso2/product-cdm.git</url>
+        <developerConnection>scm:git:https://github.com/wso2/product-cdm.git</developerConnection>
+        <connection>scm:git:https://github.com/wso2/product-cdm.git</connection>
         <tag>HEAD</tag>
     </scm>
 
@@ -619,7 +619,7 @@
                 <artifactId>maven-release-plugin</artifactId>
                 <configuration>
                     <preparationGoals>clean install</preparationGoals>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <autoVersionSubmodules>false</autoVersionSubmodules>
                 </configuration>
             </plugin>
             <plugin>
@@ -780,11 +780,11 @@
         <!--Jaggery -->
         <jaggery.version>0.9.0.ALPHA6</jaggery.version>
         <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
-        <jaggery.extensions.sso.version>1.1.0-SNAPSHOT</jaggery.extensions.sso.version>
+        <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
 
         <!--Testing -->
         <automation.test.framework.version>4.3.1</automation.test.framework.version>
-        <automation.utils.version>4.3.0-SNAPSHOT</automation.utils.version>
+        <automation.utils.version>4.3.0</automation.utils.version>
         <testng.version>6.8</testng.version>
         <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
 
@@ -802,14 +802,11 @@
         <!-- Carbon Commons -->
         <carbon.commons.version>4.3.2</carbon.commons.version>
 
-        <!-- Carbon Utils -->
-        <carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
-
         <!-- Carbon Deployment -->
         <carbon.deployment.version>4.3.0</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>4.3.0</carbon.identity.version>
+        <carbon.identity.version>4.3.1</carbon.identity.version>
 
         <!-- Multi-tenancy -->
         <carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
@@ -818,10 +815,7 @@
         <carbon.registry.version>4.3.0</carbon.registry.version>
 
         <!-- Governance -->
-        <carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version>
-
-        <!-- Transport Management -->
-        <carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
+        <carbon.governance.version>4.3.0</carbon.governance.version>
 
         <!-- Device Management -->
         <carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml
index 48d8c6aaac3..10a57d72aa9 100644
--- a/product/modules/integration/tests-common/admin-clients/pom.xml
+++ b/product/modules/integration/tests-common/admin-clients/pom.xml
@@ -29,8 +29,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdm</groupId>
-    <artifactId>org.wso2.cdm.integration.common.clients</artifactId>
+    <groupId>org.wso2.carbon.cdm</groupId>
+    <artifactId>org.wso2.carbon.cdm.integration.common.clients</artifactId>
     <packaging>jar</packaging>
     <name>WSO2 CDM - Integration Admin Clients</name>
 </project>
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 db30f96b55d..560011cbf2c 100644
--- a/product/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -29,8 +29,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.cdm.integration.common.utils</artifactId>
-    <groupId>org.wso2.cdm</groupId>
+    <artifactId>org.wso2.carbon.cdm.integration.common.utils</artifactId>
+    <groupId>org.wso2.carbon.cdm</groupId>
     <packaging>jar</packaging>
     <name>WSO2 CDM - Integration Test Utils</name>
 
diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml
index 4524a0eee12..6adb6f73344 100644
--- a/product/modules/integration/tests-common/ui-pages/pom.xml
+++ b/product/modules/integration/tests-common/ui-pages/pom.xml
@@ -29,8 +29,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdm</groupId>
-    <artifactId>org.wso2.cdm.integration.ui.pages</artifactId>
+    <groupId>org.wso2.carbon.cdm</groupId>
+    <artifactId>org.wso2.carbon.cdm.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
     <name>WSO2 CDM - Integration Test Ui Pages</name>
 
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 6e51f1f530e..9eb4126ce49 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -140,11 +140,14 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
-                                <!-- End of Carbon Deployment Features -->
-
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
+                                    org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
+                                <!-- End of Carbon Deployment Features -->
+
 
                                 <!-- Carbon Utils Features -->
                                 <!-- End of Carbon Utils Features -->
@@ -159,9 +162,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
-                                </featureArtifactDef>
+
                                 <!-- End of Carbon Commons Features -->
 
                                 <!-- API Manager related features -->
@@ -178,7 +179,7 @@
 
                                 <!-- Identity Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
                                 <!--featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -250,13 +251,13 @@
 
                                 <!-- Governance Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
+                                    org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -328,12 +329,17 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
-                                <!-- End of Carbon Deployment Features -->
-
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
-                                    <version>${carbon.platform.version}</version>
+                                    <version>${carbon.deployment.version}</version>
                                 </feature>
+                                <!-- End of Carbon Deployment Features -->
+
+
 
                                 <!-- Carbon Utils Features -->
                                 <!-- End of Carbon Utils Features -->
@@ -351,10 +357,7 @@
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.transport.mgt.feature.group</id>
-                                    <version>${carbon.transport.mgt.version}</version>
-                                </feature>
+
                                  <!--End of Carbon Commons Features-->
 
                                 <!-- API Manager Features -->
@@ -374,7 +377,7 @@
                                 <!-- Identity Features -->
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.feature.group</id>
-                                    <version>${carbon.platform.version}</version>
+                                    <version>${carbon.identity.version}</version>
                                 </feature>
                                 <!--feature>
                                     <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>