From fbe6ebe9dfb56dea9d1919adae0986ad1bbdfee4 Mon Sep 17 00:00:00 2001
From: Charitha Goonetilleke <charithag@users.noreply.github.com>
Date: Mon, 14 Mar 2016 23:36:14 +0530
Subject: [PATCH 1/5] Fix json library version

---
 modules/samples/connectedcup/component/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml
index 56052b98..02e55fdb 100644
--- a/modules/samples/connectedcup/component/pom.xml
+++ b/modules/samples/connectedcup/component/pom.xml
@@ -248,7 +248,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>

From a7221a04b6d7901d06f193742b676433d5545d5e Mon Sep 17 00:00:00 2001
From: Charitha Goonetilleke <charithag@users.noreply.github.com>
Date: Mon, 14 Mar 2016 23:37:30 +0530
Subject: [PATCH 2/5] Bump json version

---
 modules/samples/currentsensor/component/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/samples/currentsensor/component/pom.xml b/modules/samples/currentsensor/component/pom.xml
index 8e40ec18..daeecf24 100644
--- a/modules/samples/currentsensor/component/pom.xml
+++ b/modules/samples/currentsensor/component/pom.xml
@@ -241,7 +241,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -260,4 +260,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

From f48b35b494180dc065070e995f11f28065b71cbf Mon Sep 17 00:00:00 2001
From: Charitha Goonetilleke <charithag@users.noreply.github.com>
Date: Mon, 14 Mar 2016 23:38:14 +0530
Subject: [PATCH 3/5] Bump json version

---
 modules/samples/doormanager/component/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/samples/doormanager/component/pom.xml b/modules/samples/doormanager/component/pom.xml
index dd9ea9aa..100f0dd9 100644
--- a/modules/samples/doormanager/component/pom.xml
+++ b/modules/samples/doormanager/component/pom.xml
@@ -234,7 +234,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -279,4 +279,4 @@
     <module>analytics</module>
     <module>ui</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

From 6029428336ea413b5d386ba68d3fe38d9c14abf1 Mon Sep 17 00:00:00 2001
From: Charitha Goonetilleke <charithag@users.noreply.github.com>
Date: Mon, 14 Mar 2016 23:58:07 +0530
Subject: [PATCH 4/5] Bump json version

---
 modules/samples/firealarm/component/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/samples/firealarm/component/pom.xml b/modules/samples/firealarm/component/pom.xml
index 45d5e76c..c99a631d 100644
--- a/modules/samples/firealarm/component/pom.xml
+++ b/modules/samples/firealarm/component/pom.xml
@@ -239,7 +239,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -265,4 +265,4 @@
         <module>analytics</module>
         <module>ui</module>
     </modules>
-</project>
\ No newline at end of file
+</project>

From 16a8e63497b8430a6168485dbde4901f955f97ae Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Tue, 15 Mar 2016 13:58:16 +0530
Subject: [PATCH 5/5] Merge branch 'master' of
 https://github.com/charithag/product-iot-server

# Conflicts:
#	modules/samples/doormanager/component/pom.xml
---
 modules/samples/doormanager/component/pom.xml   | 14 +++++++-------
 modules/tools/cdmf-devicetype-archetype/pom.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/samples/doormanager/component/pom.xml b/modules/samples/doormanager/component/pom.xml
index 2ac2a942..411ca15a 100644
--- a/modules/samples/doormanager/component/pom.xml
+++ b/modules/samples/doormanager/component/pom.xml
@@ -273,11 +273,11 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-  <modules>
-    <module>plugin</module>
-    <module>controller</module>
-    <module>manager</module>
-    <module>analytics</module>
-    <module>ui</module>
-  </modules>
+    <modules>
+        <module>plugin</module>
+        <module>controller</module>
+        <module>manager</module>
+        <module>analytics</module>
+        <module>ui</module>
+    </modules>
 </project>
diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml
index ccef2c78..b39c8ab4 100644
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>