From 5cd65a1def78510788cc817519761cf46f4a5e88 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Fri, 16 Mar 2018 22:55:46 +0530
Subject: [PATCH] Bump dependency versions and fix related issues

---
 .../src/main/webapp/WEB-INF/cxf-servlet.xml    |  4 ----
 pom.xml                                        | 18 +++++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index cebd427bb9..1f89a94bf6 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -25,10 +25,6 @@
          http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
          http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
-
     <!--Discovery Service GET Endpoint-->
     <jaxrs:server id="DiscoveryService_rest" address="/discovery/get">
         <jaxrs:serviceBeans>
diff --git a/pom.xml b/pom.xml
index bc375eccd5..9135608de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1177,8 +1177,8 @@
     <properties>
 
         <!-- Java Version Compatibility -->
-        <wso2.maven.compiler.source>1.7</wso2.maven.compiler.source>
-        <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
+        <wso2.maven.compiler.source>1.8</wso2.maven.compiler.source>
+        <wso2.maven.compiler.target>1.8</wso2.maven.compiler.target>
 
         <!--Carbon kernel versions-->
         <carbon.kernel.version>4.4.26</carbon.kernel.version>
@@ -1201,15 +1201,15 @@
 
         <!--Eclipse Osgi-->
         <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
+        <eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version>
 
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
-        <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
+        <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
         <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
 
         <!-- CXF version -->
-        <cxf.version>2.6.1</cxf.version>
+        <cxf.version>3.2.0</cxf.version>
         <cxf.bindings.version>2.5.11</cxf.bindings.version>
         <jackson.version>1.9.0</jackson.version>
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
@@ -1228,7 +1228,7 @@
         <carbon.commons.version>4.6.21</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.7.10</carbon.deployment.version>
+        <carbon.deployment.version>4.7.15</carbon.deployment.version>
 
         <!-- Carbon Identity -->
         <carbon.identity.framework.version>5.11.148</carbon.identity.framework.version>
@@ -1246,7 +1246,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
 
         <!-- XMPP/MQTT Version -->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@@ -1271,7 +1271,7 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <google.gson.version>2.2.4</google.gson.version>
+        <google.gson.version>2.3.1</google.gson.version>
         <gcm.server.version>1.0.2</gcm.server.version>
         <commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version>
         <commons-io.version>2.4</commons-io.version>
@@ -1295,7 +1295,7 @@
         <bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version>
         <bcprov-jdk15on.version>1.52.0.wso2v1</bcprov-jdk15on.version>
         <plexus-utils.version>3.0.21</plexus-utils.version>
-        <joda-time.version>2.2</joda-time.version>
+        <joda-time.version>2.3</joda-time.version>
         <wss4j.security.version>1.6.17</wss4j.security.version>
         <wss4j.security.common.version>2.0.0</wss4j.security.common.version>