From 2b3967fd71ca80e36d1f29aa5e1d6d31663d13fe Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Mon, 5 Sep 2016 16:39:13 +0530
Subject: [PATCH] Partial commit of migration

---
 .../org.wso2.carbon.device.mgt.mobile/pom.xml       |  2 +-
 pom.xml                                             | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
index 15706b2c0d..b6c82279ef 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
@@ -58,7 +58,7 @@
                             javax.xml.bind.*,
                             javax.naming,
                             javax.sql,
-                            javax.xml.parsers,
+                            javax.xml.parsers; version=0.0.0,
                             org.w3c.dom,
                             org.wso2.carbon.context,
                             org.wso2.carbon.utils.*,
diff --git a/pom.xml b/pom.xml
index 7c8444626c..3c998c4af6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,10 +623,10 @@
                         <groupId>org.wso2.carbon</groupId>
                         <artifactId>org.wso2.carbon.identity.oauth</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
-                    </exclusion>
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>-->
+                    <!--</exclusion>-->
                     <exclusion>
                         <groupId>org.apache.poi</groupId>
                         <artifactId>poi-ooxml</artifactId>
@@ -1077,6 +1077,11 @@
                 <artifactId>hibernate-validator</artifactId>
                 <version>${hibernate-validator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.apimgt</groupId>
+                <artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
+                <version>${carbon.api.mgt.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>