You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/24 14:35:30 UTC

[1/2] Replaced apache.stratos.version with project.version in pom.xml files

Updated Branches:
  refs/heads/master 1b0190484 -> 1d05e82fe


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/status-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/pom.xml b/features/manager/status-monitor/pom.xml
index ab354a1..0a5d70a 100644
--- a/features/manager/status-monitor/pom.xml
+++ b/features/manager/status-monitor/pom.xml
@@ -46,22 +46,22 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.status.monitor</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.status.monitor.core</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.status.monitor.agent</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.status.monitor.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
index 90d7a33..418740f 100644
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.activity</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -84,7 +84,7 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity:${project.version}</bundleDef>
                             </bundles>
                             <importBundles>
                             </importBundles>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
index 75cce5f..97216ac 100644
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
@@ -39,17 +39,17 @@
  	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.activity.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.activity.ui</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.activity</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
index 16975a4..f8cfaf6 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
@@ -38,22 +38,22 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.keystore.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.theme.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.common</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
index a0b6c39..f00dff9 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
@@ -38,12 +38,12 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/tenant-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/pom.xml b/features/manager/tenant-mgt/pom.xml
index d623c4c..49d8b5f 100644
--- a/features/manager/tenant-mgt/pom.xml
+++ b/features/manager/tenant-mgt/pom.xml
@@ -43,22 +43,22 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.keystore.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.theme.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
index 621993a..fae3e71 100644
--- a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
+++ b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
@@ -39,7 +39,7 @@
  	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.throttling.agent</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
         </dependency>
 	
         </dependencies>
@@ -66,8 +66,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent:${apache.stratos.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent.stub:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent:${project.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent.stub:${project.version}</bundleDef>
                             </bundles>             
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
index c00f679..ba6a0d1 100644
--- a/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
+++ b/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
@@ -44,12 +44,12 @@
 	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.throttling.manager</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
         </dependency>
 	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.throttling.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
         </dependency>
         </dependencies>
     <build>
@@ -75,8 +75,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-				<bundleDef>org.apache.stratos:org.apache.stratos.throttling.manager:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.throttling.ui:${apache.stratos.version}</bundleDef>								 <bundleDef>org.apache.stratos:org.apache.stratos.throttling.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.throttling.manager:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.throttling.ui:${project.version}</bundleDef>								 <bundleDef>org.apache.stratos:org.apache.stratos.throttling.stub:${project.version}</bundleDef>
                             </bundles>
                             <!--importFeatures>
                                 <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
index 4777845..2192cba 100644
--- a/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
+++ b/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
@@ -43,7 +43,7 @@
 	        <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.agent</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         </dependencies>
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
index 83d3ba0..f7059f5 100644
--- a/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
+++ b/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.ui.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
     </dependencies>
@@ -66,8 +66,8 @@
                             <id>org.apache.stratos.usage</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.server.feature:${apache.stratos.version}</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.ui.feature:${apache.stratos.version}</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.server.feature:${project.version}</includedFeatureDef>
+				<includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.ui.feature:${project.version}</includedFeatureDef>
                             </includedFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
index 9dd04ab..851164e 100644
--- a/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
+++ b/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
@@ -38,7 +38,7 @@
 	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.usage</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
         </dependency>
         </dependencies>
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
index 95f8c6f..4718ebc 100644
--- a/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
+++ b/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
@@ -43,7 +43,7 @@
 	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.usage.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
         </dependency>
         </dependencies>
     <build>
@@ -69,8 +69,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-				<bundleDef>org.apache.stratos:org.apache.stratos.usage.ui:${apache.stratos.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.usage.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.usage.ui:${project.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.usage.stub:${project.version}</bundleDef>
                             </bundles>
                             <!--importFeatures>
                                 <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a76d981..50e808c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,9 +164,7 @@
     </build>
 
     <properties>
-        <!-- Apache Stratos version -->
-        <apache.stratos.version>3.0.0-SNAPSHOT</apache.stratos.version>
-        <!-- carbon related versions -->
+        <!-- Carbon related versions -->
         <wso2carbon.version>4.1.0</wso2carbon.version>
         <carbon.platform.package.import.version.range>[4.1.0, 4.2.0)</carbon.platform.package.import.version.range>
         <carbon.platform.package.export.version>4.1.0</carbon.platform.package.export.version>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/cloud_controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/p2-profile/pom.xml b/products/cloud_controller/modules/p2-profile/pom.xml
index 7ab0445..683ef49 100644
--- a/products/cloud_controller/modules/p2-profile/pom.xml
+++ b/products/cloud_controller/modules/p2-profile/pom.xml
@@ -160,16 +160,16 @@
                                     org.apache.stratos:org.apache.stratos.common.feature:3.0.0-SNAPSHOT
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.usage.agent.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.usage.agent.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.throttling.agent.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.throttling.agent.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.deployment.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.deployment.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature:${project.version}
                                 </featureArtifactDef>
 				 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.version}
@@ -192,7 +192,7 @@
                                     org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}
                                 </featureArtifactDef>
 				<featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.cloud.controller.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.cloud.controller.feature:${project.version}
                                 </featureArtifactDef>
                                 
                                 <featureArtifactDef>
@@ -216,7 +216,7 @@
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.lb.common.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.lb.common.feature:${project.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
@@ -354,7 +354,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.apache.stratos.lb.common.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
@@ -362,7 +362,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.apache.stratos.cloud.controller.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
@@ -541,7 +541,7 @@
                                 <!--Cloud service deployment feature -->
                                 <feature>
                                     <id>org.apache.stratos.deployment.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
 
                                 <!-- multitenancy feature groups -->
@@ -552,15 +552,15 @@
 
                                 <feature>
                                     <id>org.apache.stratos.load.balance.agent.server.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.stratos.usage.agent.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.stratos.throttling.agent.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.cassandra.server.feature.group</id>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/elb/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/filter.properties b/products/elb/modules/distribution/src/main/assembly/filter.properties
index 3c68353..bcda18d 100644
--- a/products/elb/modules/distribution/src/main/assembly/filter.properties
+++ b/products/elb/modules/distribution/src/main/assembly/filter.properties
@@ -2,7 +2,6 @@ product.name=Apache Stratos ELB
 product.key=ELB
 product.version=2.0.5
 
-apache.stratos.version=3.0.0-SNAPSHOT
 lb.version=2.0.5
 default.server.role=ElasticLoadBalancer
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/cloud-service-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/pom.xml b/products/stratos_controller/modules/cloud-service-mgt/pom.xml
index 23847ce..58fa774 100644
--- a/products/stratos_controller/modules/cloud-service-mgt/pom.xml
+++ b/products/stratos_controller/modules/cloud-service-mgt/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
    

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/dashboard/pom.xml b/products/stratos_controller/modules/dashboard/pom.xml
index 46d11da..9615b64 100644
--- a/products/stratos_controller/modules/dashboard/pom.xml
+++ b/products/stratos_controller/modules/dashboard/pom.xml
@@ -130,12 +130,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/features/service/org.apache.stratos.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.feature/pom.xml
index 8627d1b..4793423 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.feature/pom.xml
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.ui.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
     </dependencies>
@@ -69,10 +69,10 @@
                             <propertiesFile>../etc/feature.properties</propertiesFile>
                             <includedFeatures>
                                 <includedFeatureDef>
-                                    org.apache.stratos:org.apache.stratos.server.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.server.feature:${project.version}
                                 </includedFeatureDef>
                                 <includedFeatureDef>
-                                    org.apache.stratos:org.apache.stratos.ui.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.ui.feature:${project.version}
                                 </includedFeatureDef>
                             </includedFeatures>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
index 049f98b..0672ecc 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.account.mgt</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -54,32 +54,32 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt.email.sender</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.theme.mgt</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.validate.domain</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.keystore.mgt</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -161,7 +161,7 @@
    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.manager.services.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
     </dependencies>
 
@@ -210,15 +210,15 @@
 				
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.common</bundleDef>-->
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:${stratos.component.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.email.sender:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.account.mgt:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.email.sender:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.account.mgt:${project.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt</bundleDef>-->
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</bundleDef>-->
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</bundleDef>-->
-                                <bundleDef>org.apache.stratos:org.apache.stratos.validate.domain:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.validate.domain:${project.version}</bundleDef>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification:${carbon.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.manager.services.mgt:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.manager.services.mgt:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt:${project.version}</bundleDef>
                                 <bundleDef>kaptcha.wso2:kaptcha:2.3.0.wso2v1</bundleDef>
                                 <!-- stubs -->
                             </bundles>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
index 7982324..53025fb 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -49,7 +49,7 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.common</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <!--<dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -59,12 +59,12 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.theme.mgt.ui</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.theme.mgt.stub</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.batik.wso2</groupId>
@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.validate.domain.ui</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -103,7 +103,7 @@
  <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.register.stub</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
         <dependency>
@@ -114,7 +114,7 @@
 	<dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.manager.dashboard.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
 		</dependency>
 	<dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -124,18 +124,18 @@
          <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.manager.login.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.manager.styles</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <!--stubs-->
 	    <dependency>
 		 <groupId>org.apache.stratos</groupId>
                  <artifactId>org.apache.stratos.account.mgt.stub</artifactId>
-                 <version>${apache.stratos.version}</version>
+                 <version>${project.version}</version>
             </dependency>
 	    <dependency>
                  <groupId>org.wso2.carbon</groupId>
@@ -166,7 +166,7 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.ui:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.ui:${project.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef>-->
                                 <bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt.ui</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt.stub</bundleDef>
@@ -185,10 +185,10 @@
 
 				<!--stub bundles -->
 
-				<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.stub:${project.version}</bundleDef>
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.validate.domain.stub</bundleDef>
 				<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub:${wso2carbon.version}</bundleDef>-->
-				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.register.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.register.stub:${project.version}</bundleDef>
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.stub:${wso2carbon.version}</bundleDef>
                             </bundles>
                             <importBundles>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/integration/pom.xml b/products/stratos_controller/modules/integration/pom.xml
index 73b82ad..21522be 100755
--- a/products/stratos_controller/modules/integration/pom.xml
+++ b/products/stratos_controller/modules/integration/pom.xml
@@ -66,7 +66,7 @@
                             ${basedir}/../distribution/target/wso2sc-${project.version}.zip
                         </carbon.zip>
                         <sec.verifier.dir>${basedir}/target/security-verifier/</sec.verifier.dir>
-                        <extracted.dir>stratos-controller-parent-${apache.stratos.version}</extracted.dir>
+                        <extracted.dir>stratos-controller-parent-${project.version}</extracted.dir>
                         <emma.home>${basedir}/target/emma</emma.home>
                     </systemProperties>
                     <workingDirectory>${basedir}/target</workingDirectory>
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/p2-profile-gen/pom.xml b/products/stratos_controller/modules/p2-profile-gen/pom.xml
index 9fd5f68..d137b6b 100644
--- a/products/stratos_controller/modules/p2-profile-gen/pom.xml
+++ b/products/stratos_controller/modules/p2-profile-gen/pom.xml
@@ -110,25 +110,25 @@
 				    <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.version}</featureArtifactDef>
 				    <!-- Features related to Cloud Manger -->
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.common.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.common.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.usage.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.usage.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.usage.agent.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.usage.agent.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.throttling.manager.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.throttling.manager.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
-					org.apache.stratos:org.apache.stratos.throttling.agent.feature:${apache.stratos.version}
+					org.apache.stratos:org.apache.stratos.throttling.agent.feature:${project.version}
 				    </featureArtifactDef>
 				    <featureArtifactDef>
 					org.wso2.carbon:org.wso2.carbon.billing.server.feature:2.1.3
@@ -168,7 +168,7 @@
 				    </featureArtifactDef>
 				    <!-- End GApp SSO features -->
 
-				    <featureArtifactDef>org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature:${apache.stratos.version}
+				    <featureArtifactDef>org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature:${project.version}
 				    </featureArtifactDef>
 
 				    <!-- Status Monitor Feature. Uncomment, if you want the manager to be used as a Stratos Status Monitor -->
@@ -189,9 +189,9 @@
 				    <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.feature:${carbon.version}</featureArtifactDef>
 				    <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef>
 				    <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:4.0.0</featureArtifactDef>
-				    <featureArtifactDef>org.apache.stratos:org.apache.stratos.adc.mgt.feature:${apache.stratos.version}</featureArtifactDef>
+				    <featureArtifactDef>org.apache.stratos:org.apache.stratos.adc.mgt.feature:${project.version}</featureArtifactDef>
 				<featureArtifactDef>
-                                    org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${apache.stratos.version}
+                                    org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${project.version}
                                 </featureArtifactDef>
 				 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${wso2carbon.version}
@@ -270,11 +270,11 @@
 
 				<feature>
 				    <id>org.apache.stratos.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.common.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<!-- start BAM -->
 				<feature>
@@ -333,23 +333,23 @@
 
 				<feature>
 				    <id>org.apache.stratos.load.balance.agent.server.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.usage.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.usage.agent.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.throttling.manager.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.throttling.agent.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
 				    <id>org.wso2.carbon.billing.server.feature.group</id>
@@ -369,15 +369,15 @@
 				</feature>
 				<feature>
 				    <id>org.apache.stratos.tenant.activity.server.feature.group</id>
-				    <version>${apache.stratos.version}</version>
+				    <version>${project.version}</version>
 				</feature>
 				<feature>
                                     <id>org.apache.stratos.adc.mgt.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
 				<feature>
                                     <id>org.apache.stratos.cartridge.mgt.ui.feature.group</id>
-                                    <version>${apache.stratos.version}</version>
+                                    <version>${project.version}</version>
                                 </feature>
 				 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/products/stratos_controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/pom.xml b/products/stratos_controller/pom.xml
index ec857da..fc57190 100755
--- a/products/stratos_controller/pom.xml
+++ b/products/stratos_controller/pom.xml
@@ -212,17 +212,17 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt.email.sender</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -232,17 +232,17 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.theme.mgt</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.redirector.servlet</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.batik.wso2</groupId>
@@ -392,7 +392,7 @@
 	<synapse.version>2.1.1.wso2v4</synapse.version>
         <stratos.controller.version>1.0.1</stratos.controller.version>
         <stratos.component.version>2.1.0</stratos.component.version>
-	<apache.stratos.version>3.0.0-SNAPSHOT</apache.stratos.version>
+	<project.version>3.0.0-SNAPSHOT</project.version>
         <stratos.component.patch.version>2.1.3</stratos.component.patch.version>
         <eclipse.version>3.2.0</eclipse.version>
         <servlet-api.version>2.4</servlet-api.version>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml b/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
index 6b65a09..50e47db 100644
--- a/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
@@ -88,8 +88,8 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.load.balance.agent.stub.*; version="${apache.stratos.version}",
-                            org.apache.stratos.load.balance.agent.*; version="${apache.stratos.version}",
+                            org.apache.stratos.load.balance.agent.stub.*; version="${project.version}",
+                            org.apache.stratos.load.balance.agent.*; version="${project.version}",
                         </Export-Package>
                         <Import-Package>
                             *;resolution:=optional

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml b/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
index 9b46b76..a36e707 100644
--- a/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.redirector.servlet.stub/pom.xml
@@ -70,7 +70,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.redirector.servlet.stub.*; version="${apache.stratos.version}"
+                            org.apache.stratos.redirector.servlet.stub.*; version="${project.version}"
                         </Export-Package>
                         <Import-Package>
                             !org.apache.stratos.redirector.servlet.stub.*,

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
index 628760c..3965dcb 100644
--- a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
@@ -71,7 +71,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.tenant.register.stub.*; version="${apache.stratos.version}",
+                            org.apache.stratos.tenant.register.stub.*; version="${project.version}",
                         </Export-Package>
                         <Import-Package>
 			    !org.apache.stratos.tenant.register.stub.*,


[2/2] git commit: Replaced apache.stratos.version with project.version in pom.xml files

Posted by is...@apache.org.
Replaced apache.stratos.version with project.version in pom.xml files


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1d05e82f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1d05e82f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1d05e82f

Branch: refs/heads/master
Commit: 1d05e82feef9772d667dae6016eb51a94ca32f81
Parents: 1b01904
Author: Isuru Perera <is...@apache.org>
Authored: Wed Jul 24 18:05:07 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Wed Jul 24 18:05:07 2013 +0530

----------------------------------------------------------------------
 .../org.apache.stratos.account.mgt.ui/pom.xml   |  8 ++--
 .../org.apache.stratos.account.mgt/pom.xml      |  4 +-
 .../org.apache.stratos.activation/pom.xml       |  2 +-
 components/org.apache.stratos.adc.mgt/pom.xml   |  6 +--
 .../org.apache.stratos.adc.topology.mgt/pom.xml |  2 +-
 .../pom.xml                                     |  2 +-
 .../org.apache.stratos.cartridge.agent/pom.xml  |  2 +-
 .../org.apache.stratos.cartridge.mgt.ui/pom.xml |  2 +-
 components/org.apache.stratos.cli/pom.xml       |  2 +-
 .../org.apache.stratos.cloud.controller/pom.xml |  2 +-
 .../org.apache.stratos.deployment/pom.xml       |  2 +-
 .../org.apache.stratos.keystore.mgt/pom.xml     |  2 +-
 .../org.apache.stratos.lb.endpoint/pom.xml      |  4 +-
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  4 +-
 .../org.apache.stratos.tenant.activity/pom.xml  |  2 +-
 .../org.apache.stratos.tenant.mgt.core/pom.xml  |  2 +-
 .../pom.xml                                     |  2 +-
 .../org.apache.stratos.tenant.mgt.ui/pom.xml    |  4 +-
 .../org.apache.stratos.tenant.mgt/pom.xml       |  4 +-
 .../pom.xml                                     |  6 +--
 .../org.apache.stratos.throttling.agent/pom.xml |  4 +-
 .../pom.xml                                     |  8 ++--
 .../org.apache.stratos.throttling.ui/pom.xml    |  4 +-
 .../org.apache.stratos.usage.agent/pom.xml      |  2 +-
 components/org.apache.stratos.usage.ui/pom.xml  |  4 +-
 components/org.apache.stratos.usage/pom.xml     |  4 +-
 .../pom.xml                                     |  2 +-
 .../org.apache.stratos.validate.domain/pom.xml  |  2 +-
 .../org.apache.stratos.adc.mgt.feature/pom.xml  |  8 ++--
 .../pom.xml                                     | 12 +++---
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  8 ++--
 features/manager/cartridge-mgt/pom.xml          |  6 +--
 .../org.apache.stratos.common.feature/pom.xml   |  8 ++--
 .../pom.xml                                     | 30 +++++++--------
 .../pom.xml                                     | 16 ++++----
 features/manager/deployment/pom.xml             |  2 +-
 .../org.apache.stratos.gapp.feature/pom.xml     |  4 +-
 .../org.apache.stratos.gapp.ui.feature/pom.xml  |  4 +-
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  2 +-
 features/manager/load-balance-agent/pom.xml     |  4 +-
 features/manager/pom.xml                        | 20 +++++-----
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  2 +-
 features/manager/status-monitor/pom.xml         |  8 ++--
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  4 +-
 features/manager/tenant-mgt/pom.xml             |  8 ++--
 .../pom.xml                                     |  6 +--
 .../pom.xml                                     |  8 ++--
 .../pom.xml                                     |  2 +-
 .../org.apache.stratos.usage.feature/pom.xml    |  8 ++--
 .../pom.xml                                     |  2 +-
 .../org.apache.stratos.usage.ui.feature/pom.xml |  6 +--
 pom.xml                                         |  4 +-
 .../cloud_controller/modules/p2-profile/pom.xml | 24 ++++++------
 .../src/main/assembly/filter.properties         |  1 -
 .../modules/cloud-service-mgt/pom.xml           |  2 +-
 .../modules/dashboard/pom.xml                   |  4 +-
 .../service/org.apache.stratos.feature/pom.xml  |  8 ++--
 .../org.apache.stratos.server.feature/pom.xml   | 26 ++++++-------
 .../org.apache.stratos.ui.feature/pom.xml       | 26 ++++++-------
 .../modules/integration/pom.xml                 |  4 +-
 .../modules/p2-profile-gen/pom.xml              | 40 ++++++++++----------
 products/stratos_controller/pom.xml             | 14 +++----
 .../pom.xml                                     |  4 +-
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  2 +-
 85 files changed, 266 insertions(+), 269 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.account.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/pom.xml b/components/org.apache.stratos.account.mgt.ui/pom.xml
index 918232e..f441e86 100644
--- a/components/org.apache.stratos.account.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.account.mgt.ui/pom.xml
@@ -71,17 +71,17 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.account.mgt.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-  	    <version>${apache.stratos.version}</version>
+  	    <version>${project.version}</version>
         </dependency>
         <dependency>
           <groupId>org.json.wso2</groupId>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.stub</artifactId>
-  	    <version>${apache.stratos.version}</version>
+  	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.account.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/pom.xml b/components/org.apache.stratos.account.mgt/pom.xml
index 67a13f4..7e0ce0f 100644
--- a/components/org.apache.stratos.account.mgt/pom.xml
+++ b/components/org.apache.stratos.account.mgt/pom.xml
@@ -76,12 +76,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.activation/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.activation/pom.xml b/components/org.apache.stratos.activation/pom.xml
index b3a5cbe..6f4d0be 100644
--- a/components/org.apache.stratos.activation/pom.xml
+++ b/components/org.apache.stratos.activation/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.adc.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/pom.xml b/components/org.apache.stratos.adc.mgt/pom.xml
index ff4b6f5..153b9d4 100644
--- a/components/org.apache.stratos.adc.mgt/pom.xml
+++ b/components/org.apache.stratos.adc.mgt/pom.xml
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.adc.topology.mgt</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.cartridge.agent.stub</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.adc.topology.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.topology.mgt/pom.xml b/components/org.apache.stratos.adc.topology.mgt/pom.xml
index 978003b..c9f533f 100644
--- a/components/org.apache.stratos.adc.topology.mgt/pom.xml
+++ b/components/org.apache.stratos.adc.topology.mgt/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.autoscaler.service/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler.service/pom.xml b/components/org.apache.stratos.autoscaler.service/pom.xml
index cd31522..ba0e8a9 100644
--- a/components/org.apache.stratos.autoscaler.service/pom.xml
+++ b/components/org.apache.stratos.autoscaler.service/pom.xml
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 0b710d6..c652628 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 		<groupId>org.apache.stratos</groupId>
 		<artifactId>org.apache.stratos.cartridge.messages</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2.wso2</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.mgt.ui/pom.xml b/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
index d448f88..fa8e8fb 100644
--- a/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stratos</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index 136818f..d4c5de0 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index c0bb948..8a9b971 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.deployment/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml
index e3dd2a3..845a8f2 100644
--- a/components/org.apache.stratos.deployment/pom.xml
+++ b/components/org.apache.stratos.deployment/pom.xml
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2.wso2</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.keystore.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.keystore.mgt/pom.xml b/components/org.apache.stratos.keystore.mgt/pom.xml
index c317f11..e839912 100644
--- a/components/org.apache.stratos.keystore.mgt/pom.xml
+++ b/components/org.apache.stratos.keystore.mgt/pom.xml
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.lb.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.endpoint/pom.xml b/components/org.apache.stratos.lb.endpoint/pom.xml
index 35da614..66f6bb7 100644
--- a/components/org.apache.stratos.lb.endpoint/pom.xml
+++ b/components/org.apache.stratos.lb.endpoint/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.axis2.wso2</groupId>
@@ -73,7 +73,7 @@
         <dependency>
            <groupId>org.apache.stratos</groupId>
            <artifactId>org.apache.stratos.cartridge.messages</artifactId>
-           <version>${apache.stratos.version}</version>
+           <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.load.balance.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balance.agent/pom.xml b/components/org.apache.stratos.load.balance.agent/pom.xml
index ec5a408..4aec2a2 100644
--- a/components/org.apache.stratos.load.balance.agent/pom.xml
+++ b/components/org.apache.stratos.load.balance.agent/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.mediator.autoscale/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mediator.autoscale/pom.xml b/components/org.apache.stratos.mediator.autoscale/pom.xml
index e07b9d0..fe3060c 100644
--- a/components/org.apache.stratos.mediator.autoscale/pom.xml
+++ b/components/org.apache.stratos.mediator.autoscale/pom.xml
@@ -97,7 +97,7 @@ We need to modify this file since this copied from branch
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -112,12 +112,12 @@ We need to modify this file since this copied from branch
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cloud.controller</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.redirector.servlet.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.redirector.servlet.ui/pom.xml b/components/org.apache.stratos.redirector.servlet.ui/pom.xml
index 3ad5436..797baf9 100644
--- a/components/org.apache.stratos.redirector.servlet.ui/pom.xml
+++ b/components/org.apache.stratos.redirector.servlet.ui/pom.xml
@@ -54,7 +54,7 @@
                             org.apache.stratos.redirector.servlet.ui.util.*,
                         </Private-Package>
                         <Import-Package>
-			    org.apache.stratos.redirector.servlet.stub.*; version="${apache.stratos.version}",
+			    org.apache.stratos.redirector.servlet.stub.*; version="${project.version}",
                             javax.servlet;version="${imp.pkg.version.javax.servlet}",
                             javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
                             org.apache.lucene.*,
@@ -97,12 +97,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.redirector.servlet.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.redirector.servlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.redirector.servlet/pom.xml b/components/org.apache.stratos.redirector.servlet/pom.xml
index dbe69db..0b25d45 100644
--- a/components/org.apache.stratos.redirector.servlet/pom.xml
+++ b/components/org.apache.stratos.redirector.servlet/pom.xml
@@ -89,12 +89,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.activation</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.status.monitor.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.status.monitor.agent/pom.xml b/components/org.apache.stratos.status.monitor.agent/pom.xml
index eece75c..37ddda0 100644
--- a/components/org.apache.stratos.status.monitor.agent/pom.xml
+++ b/components/org.apache.stratos.status.monitor.agent/pom.xml
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.activity.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/pom.xml b/components/org.apache.stratos.tenant.activity.ui/pom.xml
index 206cb76..3e8439d 100644
--- a/components/org.apache.stratos.tenant.activity.ui/pom.xml
+++ b/components/org.apache.stratos.tenant.activity.ui/pom.xml
@@ -128,12 +128,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
 	    <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.activity.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.activity/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml
index 60f4852..66530a6 100644
--- a/components/org.apache.stratos.tenant.activity/pom.xml
+++ b/components/org.apache.stratos.tenant.activity/pom.xml
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.mgt.core/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/pom.xml b/components/org.apache.stratos.tenant.mgt.core/pom.xml
index 7edc826..75f093c 100644
--- a/components/org.apache.stratos.tenant.mgt.core/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.core/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
index ab9adcb..109f4b3 100644
--- a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
            <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.ui/pom.xml b/components/org.apache.stratos.tenant.mgt.ui/pom.xml
index 6fbac66..d55b2a3 100644
--- a/components/org.apache.stratos.tenant.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.ui/pom.xml
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.json.wso2</groupId>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/pom.xml b/components/org.apache.stratos.tenant.mgt/pom.xml
index 4d64463..8969f19 100644
--- a/components/org.apache.stratos.tenant.mgt/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt/pom.xml
@@ -84,7 +84,7 @@
         <dependency>
            <groupId>org.apache.stratos</groupId>
            <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-	   <version>${apache.stratos.version}</version>
+	   <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
        
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.tenant.registration.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.registration.ui/pom.xml b/components/org.apache.stratos.tenant.registration.ui/pom.xml
index 32a3e4d..7d49650 100644
--- a/components/org.apache.stratos.tenant.registration.ui/pom.xml
+++ b/components/org.apache.stratos.tenant.registration.ui/pom.xml
@@ -107,17 +107,17 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.register.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
          <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
           <groupId>org.json.wso2</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.throttling.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.agent/pom.xml b/components/org.apache.stratos.throttling.agent/pom.xml
index 72b5d01..8b4fb0b 100644
--- a/components/org.apache.stratos.throttling.agent/pom.xml
+++ b/components/org.apache.stratos.throttling.agent/pom.xml
@@ -116,12 +116,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
 	    <artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.throttling.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.manager/pom.xml b/components/org.apache.stratos.throttling.manager/pom.xml
index 4b1ea69..d2fad13 100644
--- a/components/org.apache.stratos.throttling.manager/pom.xml
+++ b/components/org.apache.stratos.throttling.manager/pom.xml
@@ -125,12 +125,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -165,12 +165,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.throttling.agent</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.agent</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.throttling.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.ui/pom.xml b/components/org.apache.stratos.throttling.ui/pom.xml
index 1b9e930..3ac9ac8 100644
--- a/components/org.apache.stratos.throttling.ui/pom.xml
+++ b/components/org.apache.stratos.throttling.ui/pom.xml
@@ -114,12 +114,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.throttling.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.usage.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.agent/pom.xml b/components/org.apache.stratos.usage.agent/pom.xml
index d5c5652..7ddef4e 100644
--- a/components/org.apache.stratos.usage.agent/pom.xml
+++ b/components/org.apache.stratos.usage.agent/pom.xml
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.usage.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.ui/pom.xml b/components/org.apache.stratos.usage.ui/pom.xml
index 99b89c9..9a07d57 100644
--- a/components/org.apache.stratos.usage.ui/pom.xml
+++ b/components/org.apache.stratos.usage.ui/pom.xml
@@ -126,12 +126,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.stub</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.usage/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage/pom.xml b/components/org.apache.stratos.usage/pom.xml
index 287f93c..b400664 100644
--- a/components/org.apache.stratos.usage/pom.xml
+++ b/components/org.apache.stratos.usage/pom.xml
@@ -126,12 +126,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.usage.agent</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
          <!--<dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.validate.domain.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/pom.xml b/components/org.apache.stratos.validate.domain.ui/pom.xml
index 72a129c..2638d15 100644
--- a/components/org.apache.stratos.validate.domain.ui/pom.xml
+++ b/components/org.apache.stratos.validate.domain.ui/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.validate.domain.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
     

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/components/org.apache.stratos.validate.domain/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain/pom.xml b/components/org.apache.stratos.validate.domain/pom.xml
index d5fddf6..0a9f1a1 100644
--- a/components/org.apache.stratos.validate.domain/pom.xml
+++ b/components/org.apache.stratos.validate.domain/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml b/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
index a284415..ed97bd8 100644
--- a/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
+++ b/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.mgt.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.topology.mgt.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
     </dependencies>
@@ -67,8 +67,8 @@
                             <id>org.apache.stratos.adc.mgt</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.mgt.server.feature:${apache.stratos.version}</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt.feature:${apache.stratos.version}</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.mgt.server.feature:${project.version}</includedFeatureDef>
+				<includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt.feature:${project.version}</includedFeatureDef>
                             </includedFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
index 392cfff..314e63c 100644
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.mgt</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.wso2.andes.wso2</groupId>
@@ -54,7 +54,7 @@
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>com.gitblit</groupId>
@@ -126,10 +126,10 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt:${apache.stratos.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt:${project.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${project.version}</bundleDef>
 				<bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.load.balance.cartridge.autoscaler.service.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.load.balance.cartridge.autoscaler.service.stub:${project.version}</bundleDef>
 				<bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
 				<bundleDef>com.google.code.gson:gson:2.1</bundleDef>
 				<bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml b/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
index 4456f78..83e571b 100644
--- a/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
+++ b/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.topology.mgt</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
          <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.lb.common</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -71,8 +71,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:${project.version}</bundleDef>
                             </bundles>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml b/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
index 43d6a22..f38e2d8 100644
--- a/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
@@ -40,12 +40,12 @@
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 	<dependency>
 	    <groupId>org.apache.stratos</groupId>
 	    <artifactId>org.apache.stratos.mediator.autoscale</artifactId>
-	    <version>${apache.stratos.version}</version>	
+	    <version>${project.version}</version>	
 	</dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
index 64f6a84..ff050c6 100644
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cartridge.messages.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cartridge.agent.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
     </dependencies>
@@ -67,8 +67,8 @@
                             <id>org.apache.stratos.cartridge.agent</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.agent.server.feature:${apache.stratos.version}</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature:${apache.stratos.version}</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.agent.server.feature:${project.version}</includedFeatureDef>
+				<includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature:${project.version}</includedFeatureDef>
                             </includedFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
index b787252..4caa32c 100644
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cartridge.agent</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
 	</dependency>
 	<dependency>
 		<groupId>org.apache.axis2.wso2</groupId>
@@ -54,7 +54,7 @@
 	<dependency>
 		<groupId>org.apache.stratos</groupId>
 		<artifactId>org.apache.stratos.adc.instanceinfo.mgt.stub</artifactId>
-		<version>${apache.stratos.version}</version>
+		<version>${project.version}</version>
 	</dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
@@ -137,10 +137,10 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.agent:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.agent:${project.version}</bundleDef>
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.utils:${wso2carbon.version}</bundleDef>
 				<bundleDef>org.eclipse.osgi:org.eclipse.osgi.services</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.adc.instanceinfo.mgt.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.adc.instanceinfo.mgt.stub:${project.version}</bundleDef>
 				<bundleDef>org.apache.axis2.wso2:axis2:${axis2.wso2.version}</bundleDef>
 				<bundleDef>org.apache.rampart.wso2:rampart-policy</bundleDef>
                                 <bundleDef>org.apache.rampart.wso2:rampart-core</bundleDef>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
index 650d355..4a5f163 100644
--- a/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cartridge.messages</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.axis2.wso2</groupId>
@@ -71,7 +71,7 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:${project.version}</bundleDef>
 				<bundleDef>org.apache.axis2.wso2:axis2:${axis2.wso2.version}</bundleDef>
                             </bundles>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 5e358c5..2649c44 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -160,7 +160,7 @@
          <dependency>
            <groupId>org.apache.stratos</groupId>
            <artifactId>org.apache.stratos.cartridge.messages</artifactId>
-           <version>${apache.stratos.version}</version>
+           <version>${project.version}</version>
          </dependency>
     </dependencies>
 
@@ -213,8 +213,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller:${project.version}</bundleDef>
                                 <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
                                 <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
                                 <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
@@ -257,7 +257,7 @@
                             </importBundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.stratos.lb.common:${apache.stratos.version}</importFeatureDef>
+                                <importFeatureDef>org.apache.stratos.lb.common:${project.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef> 
                             </importFeatures>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
index 2c6771e..fb69dd8 100644
--- a/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
@@ -40,7 +40,7 @@
 	<dependency>
 	    <groupId>org.apache.stratos</groupId>
 	    <artifactId>org.apache.stratos.lb.common</artifactId>
-	    <version>${apache.stratos.version}</version>	
+	    <version>${project.version}</version>	
 	</dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
index 2c74ec7..8ff12df 100644
--- a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
@@ -45,7 +45,7 @@
 	<dependency>
 	    <groupId>org.apache.stratos</groupId>
 	    <artifactId>org.apache.stratos.lb.endpoint</artifactId>
-	    <version>${apache.stratos.version}</version>	
+	    <version>${project.version}</version>	
 	</dependency>
     </dependencies>
 
@@ -72,12 +72,12 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.endpoint:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.endpoint:${project.version}</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.patch.version}</importFeatureDef>
                                 <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.stratos.lb.common:${apache.stratos.version}</importFeatureDef>
+                                <importFeatureDef>org.apache.stratos.lb.common:${project.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml b/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
index c0fe420..1b8f376 100644
--- a/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
+++ b/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.cartridge.mgt.ui</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
-	    <version>${apache.stratos.version}</version>	
+	    <version>${project.version}</version>	
         </dependency>
 	<dependency>
 	    <groupId>org.apache.stratos</groupId>
@@ -76,8 +76,8 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.mgt.ui:${apache.stratos.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.mgt.ui:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${project.version}</bundleDef>
 				                <bundleDef>org.apache.stratos:org.apache.stratos.adc.reponotification.service.stub:4.1.1</bundleDef>
                             </bundles>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/cartridge-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cartridge-mgt/pom.xml b/features/manager/cartridge-mgt/pom.xml
index b8e6cd7..71aae86 100644
--- a/features/manager/cartridge-mgt/pom.xml
+++ b/features/manager/cartridge-mgt/pom.xml
@@ -43,17 +43,17 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.cartridge.mgt.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	        <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.adc.reponotification.service.stub</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/common/org.apache.stratos.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.feature/pom.xml b/features/manager/common/org.apache.stratos.common.feature/pom.xml
index d634174..06d24e4 100644
--- a/features/manager/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.feature/pom.xml
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.ui.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
             </dependency>
     </dependencies>
@@ -66,8 +66,8 @@
                             <id>org.apache.stratos.common</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.common.server.feature:${apache.stratos.version}</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.common.ui.feature:${apache.stratos.version}</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.common.server.feature:${project.version}</includedFeatureDef>
+				<includedFeatureDef>org.apache.stratos:org.apache.stratos.common.ui.feature:${project.version}</includedFeatureDef>
                             </includedFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
index bc1036e..17c987a 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
@@ -38,17 +38,17 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
 	</dependency>
 	<!--dependency>
             <groupId>org.apache.stratos</groupId>
 	    <artifactId>org.apache.stratos.landing.page.deployer</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
 	</dependency-->
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.activation</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
 	<!--<dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -62,12 +62,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.dispatcher</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.redirector.servlet</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -76,7 +76,7 @@
 	<dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -114,7 +114,7 @@
         <dependency>
         	<groupId>org.apache.stratos</groupId>
         	<artifactId>org.apache.stratos.tenant.mgt</artifactId>
-        	<version>${apache.stratos.version}</version>
+        	<version>${project.version}</version>
         </dependency>
 		
 		<dependency>
@@ -125,12 +125,12 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.keystore.mgt</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wso2.carbon</groupId>
@@ -140,7 +140,7 @@
 		<dependency>
 			<groupId>org.apache.stratos</groupId>
 			<artifactId>org.apache.stratos.theme.mgt</artifactId>
-			<version>${apache.stratos.version}</version>
+			<version>${project.version}</version>
 		</dependency>
     </dependencies>
 
@@ -200,9 +200,9 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.common:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.activation:${apache.stratos.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>-->
                                 <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>-->
@@ -217,12 +217,12 @@
                                 
                                 <!-- Tenant Mgmt -->
                                 <bundleDef>org.json.wso2:json</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt:${project.version}</bundleDef>
 				<bundleDef>kaptcha.wso2:kaptcha</bundleDef>
 				<bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core:${project.version}</bundleDef>
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt:${project.version}</bundleDef>
                                 <!-- End Tenant Mgmt -->
                                 
                             </bundles>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
index 4752783..c90c15b 100644
--- a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
@@ -38,12 +38,12 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId>
-    		<version>${apache.stratos.version}</version>
+    		<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -52,28 +52,28 @@
             <dependency>
             	<groupId>org.apache.stratos</groupId>
             	<artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
             <!--  Tenant Mgmt  -->
             <dependency>
             	<groupId>org.apache.stratos</groupId>
             	<artifactId>org.apache.stratos.tenant.mgt.ui</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
             <dependency>
             	<groupId>org.apache.stratos</groupId>
             	<artifactId>org.apache.stratos.common.stub</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
             <dependency>
             	<groupId>org.apache.stratos</groupId>
             	<artifactId>org.apache.stratos.theme.mgt.ui</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
             <dependency>
             	<groupId>org.apache.stratos</groupId>
             	<artifactId>org.apache.stratos.theme.mgt.stub</artifactId>
-            	<version>${apache.stratos.version}</version>
+            	<version>${project.version}</version>
             </dependency>
              
         </dependencies>
@@ -101,7 +101,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.ui</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.stub:${apache.stratos.version}</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.stub:${project.version}</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.sso.redirector.ui</bundleDef>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef>
                             	

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/deployment/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml
index 400ad97..b63abb9 100644
--- a/features/manager/deployment/pom.xml
+++ b/features/manager/deployment/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.deployment</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
index c78dde4..37b5fff 100644
--- a/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
+++ b/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
@@ -50,8 +50,8 @@
                             <id>org.apache.stratos.gapp</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.server.feature:${apache.stratos.version}</includedFeatureDef>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.ui.feature:${apache.stratos.version}</includedFeatureDef>                                
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.server.feature:${project.version}</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.ui.feature:${project.version}</includedFeatureDef>                                
                             </includedFeatures>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
index 18da618..b1e32c6 100644
--- a/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
+++ b/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
@@ -43,12 +43,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.tenant.register.gapp.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
index 440e1cc..22edc39 100644
--- a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent.server.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent.ui.feature</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
index 00140cc..1c484b6 100644
--- a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
@@ -40,7 +40,7 @@
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent</artifactId>
-   	    <version>${apache.stratos.version}</version>
+   	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
index 2f577c1..dbaf3ca 100644
--- a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
@@ -40,7 +40,7 @@
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/load-balance-agent/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/pom.xml b/features/manager/load-balance-agent/pom.xml
index 4b55d45..0f4c4fd 100644
--- a/features/manager/load-balance-agent/pom.xml
+++ b/features/manager/load-balance-agent/pom.xml
@@ -44,12 +44,12 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.load.balance.agent</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 9c8240b..7db150c 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -83,7 +83,7 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.activation</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -93,17 +93,17 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.redirector.servlet</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.common</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
 	    </dependency>
 	    <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -113,27 +113,27 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.throttling.agent</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.activity</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
 	    <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.usage.agent</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.tenant.dispatcher</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.quartz-scheduler.wso2</groupId>
@@ -158,7 +158,7 @@
             <dependency>
                 <groupId>org.apache.stratos</groupId>
                 <artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
-                <version>${apache.stratos.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
index b86f565..fc6800a 100644
--- a/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
@@ -41,12 +41,12 @@
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.status.monitor.core</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.status.monitor.agent</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--dependencies for the service service-->
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
index 9f336d1..fefcf6e 100644
--- a/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
@@ -41,12 +41,12 @@
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.status.monitor.core</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.status.monitor</artifactId>
-	    <version>${apache.stratos.version}</version>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1d05e82f/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
index 03f492c..1910706 100644
--- a/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
@@ -41,7 +41,7 @@
         <dependency>              
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.status.monitor.ui</artifactId>
-            <version>${apache.stratos.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>              
             <groupId>org.wso2.carbon</groupId>