From 397c1daa2a56647394c11bb33c711ccc12265813 Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Thu, 29 Sep 2016 00:40:58 +0530
Subject: [PATCH] Fix package import conflicts of
 org.wso2.carbon.device.mgt.common bundle

---
 .../device-mgt/org.wso2.carbon.device.mgt.common/pom.xml  | 4 ++--
 pom.xml                                                   | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
index ad937f4a86e..87ca742be54 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
@@ -48,10 +48,10 @@
                             org.wso2.carbon.device.mgt.common.*
                         </Export-Package>
                         <Import-Package>
-                            javax.xml.bind.annotation,
+                            javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}",
                             com.fasterxml.jackson.annotation;version="${jackson-annotations.version}",
                             org.wso2.carbon.apimgt.api.model.*;version="${carbon.api.mgt.version.range}",
-                            io.swagger.annotations.*;resolution:=optional
+                            io.swagger.annotations; version="${swagger.annotations.version}"
                         </Import-Package>
                     </instructions>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 9447965615d..bd40f311903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1820,8 +1820,8 @@
         <carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Analytics Commons -->
-        <carbon.analytics.common.version>5.0.11</carbon.analytics.common.version>
-        <carbon.analytics.common.version.range>[5.0.11,6.0.0)</carbon.analytics.common.version.range>
+        <carbon.analytics.common.version>5.1.3</carbon.analytics.common.version>
+        <carbon.analytics.common.version.range>[5.1.3,6.0.0)</carbon.analytics.common.version.range>
 
         <!-- Carbon Registry -->
         <carbon.registry.version>4.5.6</carbon.registry.version>
@@ -1888,7 +1888,8 @@
 
         <!--javax ws rs version-->
         <javax.ws.rs.version>2.0.1</javax.ws.rs.version>
-        <swagger.version>1.5.8</swagger.version>
+        <swagger.version>1.5.10</swagger.version>
+        <swagger.annotations.version>1.5.10</swagger.annotations.version>
         <servlet-api.version>2.5</servlet-api.version>
 
         <!--JWT grant type extension feature-->
@@ -1898,6 +1899,7 @@
 
         <hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
         <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>
+        <javax.xml.bind.imp.pkg.version>[0.0.0,1.0.0)</javax.xml.bind.imp.pkg.version>
 
         <!-- apache pdfbox version -->
         <orbit.version.pdfbox>1.8.10.wso2v2</orbit.version.pdfbox>