Merge branch 'fix-parse-pom' into 'master'

Fix parse pom

See merge request entgra/carbon-device-mgt!894

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java

@@ -38,6 +38,7 @@ import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl;
 import org.wso2.carbon.registry.core.config.RegistryContext;
@@ -98,6 +99,7 @@ public abstract class BaseTestCase {
         ApplicationManagementDAOFactory.init(dataSource);
         ConnectionManagerUtil.init(dataSource);
         DeviceManagementDAOFactory.init(dataSource);
+        MetadataManagementDAOFactory.init(dataSource);
 //        PolicyManagementDAOFactory.init(dataSource);
 //        OperationManagementDAOFactory.init(dataSource);
 //        GroupManagementDAOFactory.init(dataSource);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/BaseDeviceManagementTest.java

@@ -37,6 +37,7 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.mock.MockDataSource;
 import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
@@ -87,6 +88,7 @@ public abstract class BaseDeviceManagementTest {
         GroupManagementDAOFactory.init(dataSource);
         OperationManagementDAOFactory.init(dataSource);
         NotificationManagementDAOFactory.init(dataSource);
+        MetadataManagementDAOFactory.init(dataSource);
     }
 
     private void initServices() throws DeviceManagementException, RegistryException, AxisFault {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql

@@ -94,6 +94,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL,
     DATE_OF_LAST_UPDATE TIMESTAMP DEFAULT NULL,
     TENANT_ID INT NOT NULL,
+    LAST_BILLED_DATE BIGINT DEFAULT 0,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
@@ -562,3 +563,14 @@ DM_DEVICE.ID = DM_DEVICE_DETAIL.DEVICE_ID
 ORDER BY TENANT_ID, DEVICE_ID;
 
 -- END OF DASHBOARD RELATED VIEWS --
+
+CREATE TABLE IF NOT EXISTS DM_BILLING (
+    INVOICE_ID INTEGER AUTO_INCREMENT NOT NULL,
+    TENANT_ID INTEGER DEFAULT 0,
+    DEVICE_ID INTEGER DEFAULT NULL,
+    BILLING_START TIMESTAMP NOT NULL,
+    BILLING_END TIMESTAMP NOT NULL,
+    PRIMARY KEY (INVOICE_ID),
+CONSTRAINT fk_DM_BILLING_DM_DEVICE2 FOREIGN KEY (DEVICE_ID)
+REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+);

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/BasePolicyManagementDAOTest.java

@@ -42,6 +42,7 @@ import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.impl.DeviceInformationManagerImpl;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
@@ -134,6 +135,7 @@ public abstract class BasePolicyManagementDAOTest {
         PolicyManagementDAOFactory.init(dataSource);
         OperationManagementDAOFactory.init(dataSource);
         GroupManagementDAOFactory.init(dataSource);
+        MetadataManagementDAOFactory.init(dataSource);
     }
 
     public void initiatePrivilegedCaronContext() throws Exception {