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] 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 -->