From f064455109ee46b97b4dd8ec1c237fd27a029b64 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Tue, 3 Feb 2015 15:29:38 +0530
Subject: [PATCH 1/2] Fixing Carbon-identity, Carbon-deployment related
 SNAPSHOT versions

---
 pom.xml                                | 19 ++++++-------------
 product/modules/p2-profile-gen/pom.xml | 21 +++++++--------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9282161b9b..646d4dbbc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,25 +574,25 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.3.2</carbon.commons.version>
+        <carbon.commons.version>4.3.4</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>
+        <carbon.deployment.version>4.3.1</carbon.deployment.version>
 
         <!-- Identity -->
-        <carbon.identity.version>4.3.0</carbon.identity.version>
+        <carbon.identity.version>4.3.2</carbon.identity.version>
 
         <!-- Multi-tenancy -->
-        <carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
 
         <!-- Registry -->
         <carbon.registry.version>4.3.0</carbon.registry.version>
 
         <!-- Governance -->
-        <carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version>
+        <carbon.governance.version>4.3.0</carbon.governance.version>
 
         <!-- Transport Management -->
         <carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
@@ -606,19 +606,12 @@
         <!-- API Management -->
         <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
 
-        <!-- Spongycastle Management-->
+        <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
-
-        <!-- Bouncycastle Management-->
         <bouncycastle.version>1.49</bouncycastle.version>
-
-        <!-- Apache wss4j Management-->
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
-
-        <!-- Codehaus Plexus Management-->
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
 
-
     </properties>
 
     <scm>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 0eca9cc140..500e0ec817 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -154,10 +154,7 @@
 
                                 <!-- Misc Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
+                                    org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
                                 <!-- End of Misc Features -->
 
@@ -196,7 +193,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.client.feature:${carbon.identity.version}
@@ -284,13 +281,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>
                                 <!-- End of Governance Features -->
 
@@ -370,13 +367,9 @@
                                 <!-- End of Jaggery Features -->
 
                                 <!-- Misc Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.transport.mgt.feature.group</id>
-                                    <version>${carbon.transport.mgt.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 Misc Features -->
 
@@ -425,7 +418,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.um.ws.service.client.feature.group</id>

From d66f1a2d2e99d255fa986a64fdd6a66e28e31dc8 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Tue, 3 Feb 2015 15:35:45 +0530
Subject: [PATCH 2/2] Fixing some of the Carbon-commons dependency versions

---
 pom.xml                                |  4 ++-
 product/modules/p2-profile-gen/pom.xml | 36 +++++++++++++-------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 646d4dbbc5..7e00198945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -542,7 +542,9 @@
         <!--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>
+        <jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
+        <jaggery.extensions.test.version>1.1.0</jaggery.extensions.test.version>
 
         <!--Testing -->
         <test.framework.version>4.3.1</test.framework.version>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 500e0ec817..340484e6ed 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -133,7 +133,7 @@
                                     org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version}
+                                    org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.carbon.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
@@ -141,14 +141,14 @@
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:uuid.feature:${jaggery.extensions.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version}-->
+                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version}
+                                    org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
                                 </featureArtifactDef>
                                 <!-- End of Jaggery Features -->
 
@@ -186,9 +186,9 @@
                                 <!-- End of Carbon Commons Features -->
 
                                 <!-- Carbon Multi-tenancy Features -->
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
                                 <!-- End of Carbon Multi-tenancy Features -->
 
                                 <!-- Identity Features -->
@@ -342,7 +342,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.jaggeryjs.modules.carbon.feature.group</id>
-                                    <version>${jaggery.extensions.version}</version>
+                                    <version>${jaggery.extensions.carbon.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.jaggeryjs.modules.process.feature.group</id>
@@ -352,17 +352,17 @@
                                     <id>org.jaggeryjs.modules.uuid.feature.group</id>
                                     <version>${jaggery.extensions.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
-                                    <version>${jaggery.extensions.sso.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.jaggeryjs.modules.sso.feature.group</id>-->
+                                    <!--<version>${jaggery.extensions.sso.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.jaggeryjs.modules.i18n.feature.group</id>
                                     <version>${jaggery.extensions.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
-                                    <version>${jaggery.extensions.version}</version>
+                                    <version>${jaggery.extensions.test.version}</version>
                                 </feature>
                                 <!-- End of Jaggery Features -->
 
@@ -409,10 +409,10 @@
                                 <!-- End of Carbon Commons Features -->
 
                                 <!-- Carbon Multi-tenancy Features -->
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.tenant.common.server.feature.group</id>-->
-                                <!--<version>${carbon.multitenancy.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.server.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
                                 <!-- End of Carbon Multi-tenancy Features -->
 
                                 <!-- Identity Features -->