Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java

@@ -89,7 +89,7 @@ public class APIPublisherConfig {
             /* Un-marshaling API publisher configuration */
             JAXBContext ctx = JAXBContext.newInstance(APIPublisherConfig.class);
             Unmarshaller unmarshaller = ctx.createUnmarshaller();
-            unmarshaller.setSchema(getSchema());
+            //unmarshaller.setSchema(getSchema());
             config = (APIPublisherConfig) unmarshaller.unmarshal(doc);
         } catch (JAXBException e) {
             throw new DeviceManagementException("Error occurred while un-marshalling API Publisher Config", e);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java

@@ -71,7 +71,7 @@ public class DeviceConfigurationManager {
             /* Un-marshaling Device Management configuration */
             JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
             Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
-            unmarshaller.setSchema(getSchema());
+            //unmarshaller.setSchema(getSchema());
             this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
         } catch (JAXBException e) {
             throw new DeviceManagementException("Error occurred while initializing Data Source config", e);

pom.xml

@@ -1065,7 +1065,6 @@
     <properties>
         <testng.version>6.1.1</testng.version>
         <carbon.kernel.version>4.3.0</carbon.kernel.version>
-        <!--<carbon.kernel.version>4.4.0</carbon.kernel.version>-->
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
@@ -1096,7 +1095,6 @@
         <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
 
         <!-- Tomcat -->
-        <!--<orbit.version.tomcat>7.0.59.wso2v1</orbit.version.tomcat>-->
         <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
         <orbit.version.tomcat.servlet.api>7.0.52.wso2v1</orbit.version.tomcat.servlet.api>
         <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>