From ef53c43923e903a21857b4b16a23c16284067cf9 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Sun, 15 Jan 2017 03:41:48 +0530
Subject: [PATCH] Corrected coffeecup versions issues

---
 .../feature/connectedcup-feature/pom.xml          | 10 +++++-----
 .../src/resources/samples/connectedcup/pom.xml    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
index ae49f350..c5792c9c 100644
--- a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
+++ b/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
@@ -41,18 +41,18 @@
 		<dependency>
 			<groupId>org.coffeeking</groupId>
 			<artifactId>org.coffeeking.connectedcup.plugin</artifactId>
-			<version>${wso2.iot.version}</version>
+			<version>${org.coffeeking.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.coffeeking</groupId>
 			<artifactId>org.coffeeking.connectedcup.api</artifactId>
-			<version>${wso2.iot.version}</version>
+			<version>${org.coffeeking.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>org.coffeeking</groupId>
 			<artifactId>org.coffeeking.connectedcup.agent</artifactId>
-			<version>${wso2.iot.version}</version>
+			<version>${org.coffeeking.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
@@ -105,7 +105,7 @@
                                     <groupId>org.coffeeking</groupId>
                                     <artifactId>org.coffeeking.connectedcup.analytics
                                     </artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${org.coffeeking.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
@@ -117,7 +117,7 @@
                                     <groupId>org.coffeeking</groupId>
                                     <artifactId>org.coffeeking.connectedcup.ui
                                     </artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${org.coffeeking.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
diff --git a/modules/distribution/src/resources/samples/connectedcup/pom.xml b/modules/distribution/src/resources/samples/connectedcup/pom.xml
index c5437a48..560a610d 100644
--- a/modules/distribution/src/resources/samples/connectedcup/pom.xml
+++ b/modules/distribution/src/resources/samples/connectedcup/pom.xml
@@ -138,7 +138,7 @@
             <dependency>
                 <groupId>org.coffeeking</groupId>
                 <artifactId>org.coffeeking.connectedcup.plugin</artifactId>
-                <version>${wso2.iot.version}</version>
+                <version>${org.coffeeking.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -364,11 +364,13 @@
 
 
     <properties>
-		<carbon.kernel.version>4.4.11</carbon.kernel.version>
+		<carbon.kernel.version>${carbon.kernel.version}</carbon.kernel.version>
+
+        <org.coffeeking.version>1.0.0</org.coffeeking.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.7-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>3.0.6-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>${carbon.device.mgt.version}</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
@@ -382,9 +384,8 @@
         <jackson.version>1.9.0</jackson.version>
         <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
-        <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <analytics.version>1.3.0</analytics.version>
-        <wso2.iot.version>1.0.0</wso2.iot.version>
+        <eclipse.equinox.common.version>${eclipse.equinox.common.version}</eclipse.equinox.common.version>
+        <analytics.version>${carbon.analytics.version}</analytics.version>
     </properties>
 
 </project>