From d98d9c7c7a1bdd9497e5448007eedb927b4c9a7e Mon Sep 17 00:00:00 2001
From: Amal Gunatilake <amalhub@users.noreply.github.com>
Date: Thu, 27 Apr 2017 12:44:18 +0530
Subject: [PATCH 1/3] Adding Java 8 build status badge

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e45f297f7..fc9773eca 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-#carbon-device-mgt-plugins
+# carbon-device-mgt-plugins
 
-<a href='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins/'><img src='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins/badge/icon'></a>
+<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
+<a href='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins/'><img src='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins/badge/icon'></a> - Java7<br/>
+<a href='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins__java8/'><img src='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt-plugins__java8/badge/icon'></a> - Java8
 
 WSO2 MOBILE DEVICE MANAGER
 

From 738a6bfcd121e4706bbf5082f6202aedb44ae5b9 Mon Sep 17 00:00:00 2001
From: Amal Gunatilake <amalhub@users.noreply.github.com>
Date: Wed, 3 May 2017 14:40:23 +0530
Subject: [PATCH 2/3] Updating carbon.devicemgt.version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 019717eb2..18aaff6af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1128,7 +1128,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>2.0.42</carbon.devicemgt.version>
+        <carbon.devicemgt.version>2.0.58</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->

From 34c9e1cd821177b716d463c385b087a8e2102b13 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Wed, 3 May 2017 16:26:14 +0530
Subject: [PATCH 3/3] Adding a build profile for cloud

---
 .../pom.xml                                   | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
index fa76f7e3b..c070bb0b1 100644
--- a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
@@ -44,6 +44,61 @@
         </dependency>
     </dependencies>
 
+
+    <profiles>
+      <profile>
+        <id>default-profile</id>
+        <activation>
+          <activeByDefault>true</activeByDefault>
+        </activation>
+             <build>
+               <plugins>
+                 <plugin>
+                   <artifactId>maven-antrun-plugin</artifactId>
+                   <executions>
+                     <execution>
+                       <phase>test</phase>
+                       <goals>
+                         <goal>run</goal>
+                       </goals>
+                       <configuration>
+                         <tasks>
+                           <copy file="src/main/resources/default.p2.inf"
+                                 tofile="src/main/resources/p2.inf"/>
+                         </tasks>
+                       </configuration>
+                     </execution>
+                   </executions>
+                 </plugin>
+             </plugins>
+         </build>
+      </profile>
+      <profile>
+        <id>cloud</id>
+             <build>
+               <plugins>
+                 <plugin>
+                   <artifactId>maven-antrun-plugin</artifactId>
+                   <executions>
+                     <execution>
+                       <phase>test</phase>
+                       <goals>
+                         <goal>run</goal>
+                       </goals>
+                       <configuration>
+                         <tasks>
+                           <copy file="src/main/resources/cloud.p2.inf"
+                                 tofile="src/main/resources/p2.inf"/>
+                         </tasks>
+                       </configuration>
+                     </execution>
+                   </executions>
+                 </plugin>
+             </plugins>
+         </build>
+      </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>