From 0147fa478478e4e6efe230267b661338fb342159 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Fri, 30 Jun 2017 17:24:10 +0530
Subject: [PATCH] Fixing the osgi issue

---
 modules/distribution/src/assembly/bin.xml | 1 +
 pom.xml                                   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 29b7ea22..ba9ee1b6 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -653,6 +653,7 @@
                 <exclude>**/artifacts.xml</exclude>
                 <exclude>**/json_2.0.0.wso2v1.jar</exclude>
                 <exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
+                <exclude>**/httpclient_4.3.2.wso2v1.jar</exclude>
             </excludes>
         </fileSet>
 
diff --git a/pom.xml b/pom.xml
index ef83b643..6de72bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1517,17 +1517,17 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.13</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.15</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	    <carbon.device.mgt.plugin.version>4.0.13</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.14</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.94</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->