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

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -56,7 +56,7 @@
                             org.osgi.service.component,
                             org.apache.commons.logging,
                             javax.security.auth.x500,
-                            javax.xml.parsers,
+                            javax.xml.*,
                             org.apache.commons.codec.binary,
                             org.bouncycastle.asn1,
                             org.bouncycastle.asn1.x500,

components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml

@@ -121,9 +121,7 @@
                             org.wso2.carbon.registry.common.*;version="${carbon.registry.imp.pkg.version.range}",
                             org.wso2.carbon.registry.indexing.*; version="${carbon.registry.imp.pkg.version.range}",
                             org.json;version="${commons-json.version}",
-                            javax.xml.bind,
+                            javax.xml.*,
-                            javax.xml.bind.annotation,
-                            javax.xml.parsers,
                             org.w3c.dom,
                             org.wso2.carbon.base
                         </Import-Package>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -115,7 +115,7 @@ public class OperationManagerImpl implements OperationManager {
                             org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.PENDING,
                             org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.REPEATED);
                 }
-                operationMappingDAO.addOperationMapping(operationId, device.getId());
+                operationMappingDAO.addOperationMapping(operationId, device.getEnrolmentInfo().getId());
                 if (notificationStrategy != null) {
                     try {
                         notificationStrategy.execute(new NotificationContext(deviceId, operation));

components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml

@@ -60,8 +60,7 @@
                             javax.sql,
                             javax.cache,
                             javax.naming,
-                            javax.xml.bind.*,
+                            javax.xml.*,
-                            javax.xml.parsers.*,
                             org.w3c.dom,
                             org.wso2.carbon.policy.mgt.common.*,
                             org.wso2.carbon.user.core.*,