diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
index d135f26832..6cb83f5974 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
@@ -125,7 +125,7 @@
                             javax.servlet;resolution:=optional,
                             javax.xml.*;resolution:=optional,
                             org.apache.commons.lang,
-                            javax.ws.rs;version="0.0.0",
+                            javax.ws.rs;version="0.0.0";resolution:=optional,
                             org.scannotation
                         </Import-Package>
                     </instructions>
diff --git a/pom.xml b/pom.xml
index 74257bdccc..3711d3cfe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1727,8 +1727,8 @@
         <carbon.analytics.common.version.range>[5.0.11,6.0.0)</carbon.analytics.common.version.range>
 
         <!-- Carbon Analytics -->
-        <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
-        <carbon.analytics.version.range>[1.0.6,2.0.0]</carbon.analytics.version.range>
+        <carbon.analytics.version>1.0.5</carbon.analytics.version>
+        <carbon.analytics.version.range>[1.0.5,2.0.0]</carbon.analytics.version.range>
 
         <!-- Carbon Registry -->
         <carbon.registry.version>4.4.8</carbon.registry.version>