From ea032337d3e158aaa47505cc9e6f743c44e12bb2 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Tue, 26 Jul 2016 11:30:28 +0530
Subject: [PATCH] Changing Kernel version that carbon-device-mgt repository
 depends on and fixing the axiom version range

---
 .../pom.xml                                      | 14 +++++++-------
 pom.xml                                          | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index 50e79984474..daddc132a19 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -49,10 +49,10 @@
             <artifactId>org.wso2.carbon.device.mgt.api.feature</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.commons</groupId>
-            <artifactId>org.wso2.carbon.email.verification</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.carbon.commons</groupId>-->
+            <!--<artifactId>org.wso2.carbon.email.verification</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -114,9 +114,9 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <bundleDef>
-                                    org.wso2.carbon.commons:org.wso2.carbon.email.verification
-                                </bundleDef>
+                                <!--<bundleDef>-->
+                                    <!--org.wso2.carbon.commons:org.wso2.carbon.email.verification-->
+                                <!--</bundleDef>-->
                                 <bundleDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
                                 </bundleDef>
diff --git a/pom.xml b/pom.xml
index bc5f7311a22..d9afb815108 100644
--- a/pom.xml
+++ b/pom.xml
@@ -757,11 +757,11 @@
                 <version>${axiom.wso2.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.wso2.carbon.commons</groupId>
-                <artifactId>org.wso2.carbon.email.verification</artifactId>
-                <version>${carbon.commons.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.wso2.carbon.commons</groupId>-->
+                <!--<artifactId>org.wso2.carbon.email.verification</artifactId>-->
+                <!--<version>${carbon.commons.version}</version>-->
+            <!--</dependency>-->
 
             <!-- API Management dependencies -->
             <dependency>
@@ -1739,7 +1739,7 @@
 
     <properties>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
+        <carbon.kernel.version>4.4.7</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 5.0.0)</carbon.kernel.version.range>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
@@ -1791,8 +1791,8 @@
         <carbon.governance.version>4.5.8</carbon.governance.version>
 
         <!-- Axiom -->
-        <axiom.version>1.2.11-wso2v5</axiom.version>
-        <axiom.osgi.version.range>[1.2.11.wso2v5, 1.3.0)</axiom.osgi.version.range>
+        <axiom.version>1.2.11-wso2v11</axiom.version>
+        <axiom.osgi.version.range>[1.2.11, 1.3.0)</axiom.osgi.version.range>
         <axiom.wso2.version>1.2.11.wso2v5</axiom.wso2.version>
 
         <!-- Carbon Device Management -->