You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Charitha Goonetilleke 618cc1b854 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master ... # Conflicts: # components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml # components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml # components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml # components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml # components/analytics/iot-analytics/pom.xml # components/analytics/pom.xml # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml # components/device-types/androidsense-plugin/pom.xml # components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml # components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml # components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml # components/device-types/arduino-plugin/pom.xml # components/device-types/pom.xml # components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml # components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml # components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml # components/device-types/raspberrypi-plugin/pom.xml # components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml # components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml # components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml # components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml # components/device-types/virtual-fire-alarm-plugin/pom.xml # components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml # components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml # components/extensions/appm-connector/pom.xml # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml # components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml # components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml # components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml # components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml # components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml # components/extensions/cdmf-transport-adapters/pom.xml # components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml # components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml # components/extensions/mb-extensions/pom.xml # components/extensions/pom.xml # components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml # components/extensions/pull-notification-listeners/pom.xml # components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/pom.xml # components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/pom.xml # components/extensions/remote-session-extension/pom.xml # components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml # components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml # components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml # components/extensions/siddhi-extensions/pom.xml # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml # components/mobile-plugins/android-plugin/pom.xml # components/mobile-plugins/pom.xml # components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml # components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml # components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml # components/mobile-plugins/windows-plugin/pom.xml # components/test-coverage/pom.xml # features/analytics-feature/org.wso2.carbon.device.mgt.cdmf.analytics.feature/pom.xml # features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml # features/analytics-feature/org.wso2.carbon.iot.device.statistics.dashboard.feature/pom.xml # features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml # features/analytics-feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/pom.xml # features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics.feature/pom.xml # features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.backend.feature/pom.xml # features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/pom.xml # features/device-types-feature/arduino-plugin-feature/pom.xml # features/device-types-feature/pom.xml # features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/pom.xml # features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/pom.xml # features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/pom.xml # features/device-types-feature/raspberrypi-plugin-feature/pom.xml # features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml # features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml # features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml # features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml # features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml # features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml # features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml # features/extensions-feature/org.wso2.carbon.appmgt.mdm.restconnector.feature/pom.xml # features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml # features/extensions-feature/org.wso2.carbon.device.mgt.notification.listener.feature/pom.xml # features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml # features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml # features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml # features/extensions-feature/org.wso2.gpl.siddhi.extension.geo.script.feature/pom.xml # features/extensions-feature/pom.xml # features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml # features/mobile-plugins-feature/android-plugin-feature/pom.xml # features/mobile-plugins-feature/pom.xml # features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml # features/mobile-plugins-feature/windows-plugin-feature/pom.xml # pom.xml		6 years ago
..
src	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master	6 years ago
pom.xml	[WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare for next development iteration	6 years ago