From abac85ef41502913003ddada3012d06ab4018f26 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Tue, 1 Oct 2024 05:32:08 +0530 Subject: [PATCH 1/4] Bump development version to 7.0.0-SNAPSHOT --- .github/stale.yml | 15 ------- .gitlab-ci.yml | 30 -------------- .travis.yml | 8 ---- .../org.wso2.carbon.iot.geo.dashboard/pom.xml | 2 +- components/analytics/iot-analytics/pom.xml | 2 +- components/analytics/pom.xml | 4 +- components/device-types/pom.xml | 6 +-- .../pom.xml | 6 +-- .../pom.xml | 6 +-- .../virtual-fire-alarm-plugin/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../cdmf-transport-adapters/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- components/extensions/mb-extensions/pom.xml | 2 +- components/extensions/pom.xml | 6 +-- .../pom.xml | 6 +-- .../pull-notification-listeners/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../extensions/siddhi-extensions/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 6 +-- .../mobile-plugins/android-plugin/pom.xml | 4 +- components/mobile-plugins/pom.xml | 6 +-- components/test-coverage/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- features/analytics-feature/pom.xml | 6 +-- features/device-types-feature/pom.xml | 6 +-- .../pom.xml | 4 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 6 +-- .../pom.xml | 4 +- .../android-plugin-feature/pom.xml | 4 +- features/mobile-plugins-feature/pom.xml | 6 +-- pom.xml | 40 ++++++++++--------- 57 files changed, 122 insertions(+), 173 deletions(-) delete mode 100644 .github/stale.yml delete mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 9cbd495b1..000000000 --- a/.github/stale.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 10 -# Don't close isssues or pulls -daysUntilClose: false -# Issues with these labels will never be considered stale -exemptLabels: - - Resolution/Postponed -# Label to use when marking an issue as stale -staleLabel: Resolution/Stale -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 14000da5a..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,30 +0,0 @@ -image: charithag/docker-mvn-jdk8:latest - -variables: - MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode" - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" - -cache: - paths: - - .m2/repository/ - - target/ - -build: - stage: build - script: - - rm -rf .m2/repository/ - - mvn $MAVEN_CLI_OPTS clean install -Dmaven.test.skip=true - -test: - stage: test - script: - - mvn $MAVEN_CLI_OPTS test - -deploy: - stage: deploy - script: - - mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true - - rm -rf .m2/repository/* - only: - - master@entgra/carbon-device-mgt-plugins - - kernel-4.6.x@entgra/carbon-device-mgt-plugins diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0cbd9fd90..000000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: java -jdk: - - oraclejdk8 -cache: - directories: - - .autoconf - - $HOME/.m2 -script: mvn clean install diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml index ca28eec10..f27c05835 100644 --- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml +++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.carbon.iot.geo.dashboard - WSO2 Carbon - IoT Geo Dashboard C-APP + Entgra Device Management Plugins - IoT Geo Dashboard C-APP http://entgra.io This feature contains the IoT geo dashboard gadget pom diff --git a/components/analytics/iot-analytics/pom.xml b/components/analytics/iot-analytics/pom.xml index f4d538f19..ec98eff61 100644 --- a/components/analytics/iot-analytics/pom.xml +++ b/components/analytics/iot-analytics/pom.xml @@ -29,7 +29,7 @@ 4.0.0 iot-analytics pom - WSO2 Carbon - IoT Analytics Scripts + Entgra Device Management Plugins - IoT Analytics Scripts http://entgra.io diff --git a/components/analytics/pom.xml b/components/analytics/pom.xml index 5d80e519a..124307729 100644 --- a/components/analytics/pom.xml +++ b/components/analytics/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent + device-mgt-plugins 6.0.13-SNAPSHOT ../../pom.xml @@ -29,7 +29,7 @@ 4.0.0 analytics pom - WSO2 Carbon - Mobile Plugins Extensions + Entgra Device Management Plugins - Mobile Plugins Extensions http://entgra.io diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 608b8bfc0..70d65ece5 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 device-types pom - WSO2 Carbon - IoT Plugins + Entgra Device Management Plugins - IoT Plugins http://entgra.io diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index 56c256c18..7b3769e6c 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,13 +23,13 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl - WSO2 Carbon - IoT Server VirtualFireAlarm Agent - WSO2 Carbon - VirtualFireAlarm Device Agent Implementation + Entgra Device Management Plugins - IoT Server VirtualFireAlarm Agent + Entgra Device Management Plugins - VirtualFireAlarm Device Agent Implementation http://entgra.io diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index a68bbcfd5..e05c7513c 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,15 +21,15 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.virtualfirealarm.api war - WSO2 Carbon - IoT Server VirtualFireAlarm API - WSO2 Carbon - Virtual FireAlarm Service Management API Implementation + Entgra Device Management Plugins - IoT Server VirtualFireAlarm API + Entgra Device Management Plugins - Virtual FireAlarm Service Management API Implementation http://entgra.io diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index 4fdd9c5fd..8c6e97994 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins device-types - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 virtual-fire-alarm-plugin pom - WSO2 Carbon - Virtual Fire Alarm Plugin + Entgra Device Management Plugins - Virtual Fire Alarm Plugin http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index c1c73ea7d..c0fcd4a6a 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.input.adapter.extension bundle - WSO2 Carbon - Device Mgt Input Adaptor Extensions Module + Entgra Device Management Plugins - Device Mgt Input Adaptor Extensions Module Provides the back-end functionality of Input adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 557db828b..b0eed15ed 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.input.adapter.http bundle - WSO2 Carbon - Device Mgt Input Adaptor Module - Http + Entgra Device Management Plugins - Device Mgt Input Adaptor Module - Http Provides the back-end functionality of Input adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index b65008e30..d06bef139 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.input.adapter.mqtt bundle - WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT + Entgra Device Management Plugins - Device Mgt Input Adaptor Module - MQTT Provides the back-end functionality of Input adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index 40b3a54a7..78c9d4aed 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,14 +21,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.input.adapter.thrift bundle - WSO2 Carbon - Event Input Thrift Adapter Module + Entgra Device Management Plugins - Event Input Thrift Adapter Module org.wso2.carbon.event.input.adapter.thrift provides the back-end functionality of input wso2event adapter diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index f8ab2c790..409aa7c88 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.input.adapter.xmpp bundle - WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP + Entgra Device Management Plugins - Device Mgt Input Adaptor Module - XMPP Provides the back-end functionality of Input adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index c85497bde..5368e960a 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.output.adapter.http bundle - WSO2 Carbon - Device Management Output HTTP adapter Module + Entgra Device Management Plugins - Device Management Output HTTP adapter Module io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 9ea14f4d8..4864912d6 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,14 +20,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.output.adapter.mqtt bundle - WSO2 Carbon - Device Mgt Output MQTT Adaptor Module + Entgra Device Management Plugins - Device Mgt Output MQTT Adaptor Module io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 4a80797a7..d2d3c7040 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 9b9f0d837..0fc0a245e 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,14 +21,14 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 io.entgra.device.mgt.plugins.output.adapter.websocket bundle - WSO2 Carbon - Event Output UI Adapter Module + Entgra Device Management Plugins - Event Output UI Adapter Module org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of ui event adapter diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index ba703eb3f..23eafa74b 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../../pom.xml @@ -28,7 +28,7 @@ io.entgra.device.mgt.plugins.output.adapter.xmpp bundle - WSO2 Carbon - Device Mgt Output XMPP Adaptor Module + Entgra Device Management Plugins - Device Mgt Output XMPP Adaptor Module io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor http://entgra.io diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index dba1bd58c..ea99b6e16 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 cdmf-transport-adapters pom - WSO2 Carbon - IoT Base Plugin + Entgra Device Management Plugins - IoT Base Plugin http://entgra.io diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 791eea9a5..639d978f3 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 5ffd90851..5ac82e895 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 0e6a992a2..e1aa52db8 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml index b2971bffc..b6cb95b76 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml @@ -29,8 +29,8 @@ 4.0.0 org.wso2.carbon.andes.extensions.device.mgt.api war - WSO2 Carbon - MQTT Topics Management API - WSO2 Carbon - MQTT Topics Management API + Entgra Device Management Plugins - MQTT Topics Management API + Entgra Device Management Plugins - MQTT Topics Management API http://entgra.io diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml index c9ef5f175..0f0205732 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml @@ -29,7 +29,7 @@ 4.0.0 org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization bundle - WSO2 Carbon - Component - MQTT - Authorization Manager + Entgra Device Management Plugins - Component - MQTT - Authorization Manager MQTT authorization manager based on Carbon device manager http://entgra.io diff --git a/components/extensions/mb-extensions/pom.xml b/components/extensions/mb-extensions/pom.xml index 2bd0a521b..96432ce40 100644 --- a/components/extensions/mb-extensions/pom.xml +++ b/components/extensions/mb-extensions/pom.xml @@ -29,7 +29,7 @@ 4.0.0 mb-extensions pom - WSO2 Carbon - MB Extension + Entgra Device Management Plugins - MB Extension http://entgra.io diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index cb44ede29..cc5c94f8a 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 extensions pom - WSO2 Carbon - Mobile Plugins Extensions + Entgra Device Management Plugins - Mobile Plugins Extensions http://entgra.io diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 2f8fabd7e..250923205 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml @@ -30,8 +30,8 @@ 4.0.0 io.entgra.device.mgt.plugins.mqtt.notification.listener bundle - WSO2 Carbon - MQTT Pull Notification Listener Implementation - WSO2 Carbon - MQTT Pull Notification Lister Implementation + Entgra Device Management Plugins - MQTT Pull Notification Listener Implementation + Entgra Device Management Plugins - MQTT Pull Notification Lister Implementation http://entgra.io diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index e3d874b54..35bfd182e 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 pull-notification-listeners pom - WSO2 Carbon - Pull Notification Extension + Entgra Device Management Plugins - Pull Notification Extension http://entgra.io diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index d9776d924..c8a4aa52c 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index dd1855240..d2eba4a84 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 08ead26cc..bc5640a50 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins extensions - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 siddhi-extensions pom - WSO2 Carbon - Siddhi Extension + Entgra Device Management Plugins - Siddhi Extension http://entgra.io diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 8046c8ee2..691588997 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,13 +21,13 @@ android-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.mobile.android.api - WSO2 Carbon - Android JAX-RS API + Entgra Device Management Plugins - Android JAX-RS API Android JAX-RS API war diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index 609ec94c5..d5c82064d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index 34667733c..941fb950b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,13 +23,13 @@ android-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.mobile.android.ui - WSO2 Carbon - Mobile Android UI + Entgra Device Management Plugins - Mobile Android UI pom diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index 972b771c4..4509b6bc2 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,15 +22,15 @@ android-plugin io.entgra.device.mgt.plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.mobile.android bundle - WSO2 Carbon - Mobile Device Management Android Impl - WSO2 Carbon - Mobile Device Management Android Implementation + Entgra Device Management Plugins - Mobile Device Management Android Impl + Entgra Device Management Plugins - Mobile Device Management Android Implementation http://entgra.io diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index 27102305b..f09439342 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 android-plugin pom - WSO2 Carbon - Mobile Plugins + Entgra Device Management Plugins - Mobile Plugins http://entgra.io diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 01613e24d..ab2279c41 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 mobile-plugins pom - WSO2 Carbon - Mobile Plugins + Entgra Device Management Plugins - Mobile Plugins http://entgra.io diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index 1298270e6..dfc4f6193 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -20,7 +20,7 @@ - io.entgra.device.mgt.plugins.parent + device-mgt-plugins io.entgra.device.mgt.plugins 6.0.0-SNAPSHOT ../../pom.xml @@ -28,7 +28,7 @@ 4.0.0 test-coverage - WSO2 Carbon - Carbon Device Management Plugins Test Coverage Component + Entgra Device Management Plugins - Carbon Device Management Plugins Test Coverage Component target diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index 2802ca138..2bbfb9f0c 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,14 +23,14 @@ io.entgra.device.mgt.plugins analytics-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.analytics.feature pom - WSO2 Carbon - IoT Server Analytics Feature + Entgra Device Management Plugins - IoT Server Analytics Feature http://entgra.io This feature contains the Analytics Script for the IoT Server diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml index f16673c74..329db5fb0 100644 --- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml +++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml @@ -30,7 +30,7 @@ 4.0.0 org.wso2.carbon.iot.geo.dashboard.feature pom - WSO2 Carbon - IoT Geo Dashboard Feature + Entgra Device Management Plugins - IoT Geo Dashboard Feature http://entgra.io This feature contains the IoT geo dashboard gadget diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index 4ff7daa5d..af0fc26b4 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 analytics-feature pom - WSO2 Carbon - IoT Server IoT Analytics Feature + Entgra Device Management Plugins - IoT Server IoT Analytics Feature http://entgra.io diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 24cfc10d1..b1f5012c0 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 device-types-feature pom - WSO2 Carbon - Device Management IoT Plugins Feature + Entgra Device Management Plugins - Device Management IoT Plugins Feature http://entgra.io diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index d93e47808..0df6f867f 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,14 +23,14 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature pom - WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature + Entgra Device Management Plugins - IoT Server VirtualFireAlarm Backend Feature http://entgra.io This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index c103f41a0..8c233a8b7 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins device-types-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 virtual-fire-alarm-plugin-feature pom - WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature + Entgra Device Management Plugins - IoT Server VirtualFireAlarm Device Feature http://entgra.io diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index ac46038ae..a31c7d307 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,14 +23,14 @@ io.entgra.device.mgt.plugins extensions-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.adapter.feature pom - WSO2 Carbon - Device Management Adapters Feature + Entgra Device Management Plugins - Device Management Adapters Feature http://entgra.io This feature contains the adapter bundles required for IoT Server diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index 324c0da89..edddb45d9 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index cc7bc8591..95cc7b1b6 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index 811eee6e3..f35d2ceaf 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -21,14 +21,14 @@ io.entgra.device.mgt.plugins extensions-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.notification.listener.feature pom - WSO2 Carbon - Notification Listener + Entgra Device Management Plugins - Notification Listener http://entgra.io This feature contains the core bundles required iot core listeners diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml index b3ea30f4c..44f057f8d 100644 --- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml +++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml @@ -30,7 +30,7 @@ 4.0.0 org.wso2.carbon.andes.extensions.device.mgt.api.feature pom - WSO2 Carbon - MQTT Topics Management API Feature + Entgra Device Management Plugins - MQTT Topics Management API Feature http://entgra.io This feature contains the API feature for the MQTT dashboard diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml index 7e04b9f29..c5885218b 100644 --- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml +++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml @@ -30,7 +30,7 @@ 4.0.0 org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature pom - WSO2 Carbon - MQTT Authorization Feature + Entgra Device Management Plugins - MQTT Authorization Feature http://entgra.io This feature contains the bundles required for mqtt authorization diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 85ed7714f..2f286f43e 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 extensions-feature pom - WSO2 Carbon - Device Management Extensions + Entgra Device Management Plugins - Device Management Extensions http://entgra.io diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 348f4b441..ff78906d9 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 io.entgra.device.mgt.plugins.mobile.android.feature pom - WSO2 Carbon - Android Device Management Feature + Entgra Device Management Plugins - Android Device Management Feature http://entgra.io This feature contains the core bundles required for Android Device Management functionality diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index cdbb3b59c..ca521cfd7 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,14 +22,14 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT ../pom.xml 4.0.0 android-plugin-feature pom - WSO2 Carbon - Device Management Android Plugin Feature + Entgra Device Management Plugins - Device Management Android Plugin Feature http://entgra.io diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index aeab5afd0..47d4a592e 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -21,15 +21,15 @@ io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent - 6.1.1-SNAPSHOT + device-mgt-plugins + 7.0.0-SNAPSHOT ../../pom.xml 4.0.0 mobile-plugins-feature pom - WSO2 Carbon - Device Management EMM Plugins Feature + Entgra Device Management Plugins - Device Management EMM Plugins Feature http://entgra.io diff --git a/pom.xml b/pom.xml index ed7ee70b6..2adaeaa84 100644 --- a/pom.xml +++ b/pom.xml @@ -17,16 +17,17 @@ ~ under the License. --> - + 4.0.0 io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.parent + device-mgt-plugins pom - 6.1.1-SNAPSHOT - WSO2 Carbon - Device Management Plugins Parent + 7.0.0-SNAPSHOT + Entgra Device Management Plugins - Parent http://entgra.io - WSO2 Carbon - Device Management Plugins Parent + Entgra Device Management Plugins - Parent org.wso2 @@ -430,11 +431,11 @@ io.entgra.device.mgt.plugins.output.adapter.websocket ${io.entgra.device.mgt.plugins.version} - - io.entgra.device.mgt.plugins - io.entgra.device.mgt.plugins.mqtt.notification.listener - ${io.entgra.device.mgt.plugins.version} - + + io.entgra.device.mgt.plugins + io.entgra.device.mgt.plugins.mqtt.notification.listener + ${io.entgra.device.mgt.plugins.version} + io.entgra.device.mgt.plugins io.entgra.device.mgt.core.device.mgt.extensions.remote.session @@ -845,11 +846,11 @@ feign-gson ${io.github.openfeign.version} - - io.github.openfeign - feign-slf4j - ${io.github.openfeign.version} - + + io.github.openfeign + feign-slf4j + ${io.github.openfeign.version} + @@ -964,11 +965,11 @@ - 5.2.4-SNAPSHOT - [5.0.0, 6.0.0) + 6.0.0-SNAPSHOT + [6.0.0, 7.0.0) - 6.1.1-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 @@ -1102,7 +1103,8 @@ https://repository.entgra.net/community/device-mgt-plugins.git - scm:git:https://repository.entgra.net/community/device-mgt-plugins.git + scm:git:https://repository.entgra.net/community/device-mgt-plugins.git + scm:git:https://repository.entgra.net/community/device-mgt-plugins.git v6.0.14 From 5ee7b5ebc95a784f300993897adab465cd9e3f36 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Tue, 1 Oct 2024 06:14:21 +0530 Subject: [PATCH 2/4] Fix naming mismatches in component names --- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.exhook/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.initializer/pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index d2d3c7040..96a15f0d7 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -29,7 +29,7 @@ 4.0.0 io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint war - WSO2 - Webapp for UI Output Event Adapter + Entgra Device Management Plugins - Webapp for UI Output Event Adapter http://entgra.io diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 639d978f3..926b32cdd 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -28,7 +28,7 @@ 4.0.0 io.entgra.device.mgt.plugins.emqx.exhook jar - EMQX Extensions - Extension Hook + Entgra Device Management Plugins - EMQX Extension Hook diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 5ac82e895..9e26ba53f 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -28,7 +28,7 @@ 4.0.0 io.entgra.device.mgt.plugins.emqx.initializer bundle - EMQX Extensions - Extension Hook Initializer + Entgra Device Management Plugins - EMQX Extension Hook Initializer diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index e1aa52db8..1561d2a2b 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -29,7 +29,7 @@ 4.0.0 emqx-extensions pom - EMQX Extensions + Entgra Device Management Plugins - EMQX Extensions io.entgra.device.mgt.plugins.emqx.exhook diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index c8a4aa52c..7237a72a3 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -29,7 +29,7 @@ 4.0.0 io.entgra.device.mgt.plugins.extension.siddhi.device bundle - WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension + Entgra Device Management Plugins - Siddhi Extensions - Device management Core functionality as Siddhi extension http://entgra.io diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index d2eba4a84..cf9530422 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -29,7 +29,7 @@ 4.0.0 io.entgra.device.mgt.plugins.extension.siddhi.execution.json bundle - WSO2 Siddhi Execution Extension - Json + Entgra Device Management Plugins - Siddhi Extensions - Json http://entgra.io diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index d5c82064d..0ceded2bc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -27,8 +27,8 @@ 4.0.0 io.entgra.device.mgt.plugins.mobile.android.emulator - AndroidTryIt Emulator - Android Virtual Device + Entgra Device Management Plugins - AndroidTryIt Emulator + Entgra Device Management Plugins - Android Virtual Device EmulatorJava diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index edddb45d9..22ac223b4 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -28,7 +28,7 @@ io.entgra.device.mgt.plugins.extension.siddhi.device.feature pom - WSO2 Siddhi Execution Extension - Device Group Feature + Entgra Device Management Plugins - Siddhi Extensions - Device Group Feature http://entgra.io This feature contains Siddhi extension feature for device groups diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 95cc7b1b6..ba44b3420 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -28,7 +28,7 @@ io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature pom - WSO2 Siddhi Execution Extension - Json Feature + Entgra Device Management Plugins - Siddhi Extensions - Json Feature http://entgra.io This feature contains Siddhi extension feature for changing a json string to individual properties. From ab3e104ac868d9762c6e991e517dd55951678410 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Tue, 1 Oct 2024 07:34:14 +0530 Subject: [PATCH 3/4] Remove unused source and target versions --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2adaeaa84..e44cca0bd 100644 --- a/pom.xml +++ b/pom.xml @@ -974,10 +974,6 @@ 4.0.0 - - 17 - 17 - 4.8.1 1.11.2 From 1fa93231f84118737e99d9471a09319b6030137d Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Tue, 1 Oct 2024 14:28:59 +0530 Subject: [PATCH 4/4] Fix bundle imports --- .../pom.xml | 2 +- .../pom.xml | 12 ++--- .../pom.xml | 5 +- .../pom.xml | 8 +-- .../pom.xml | 10 ++-- .../pom.xml | 16 +++--- .../pom.xml | 50 +++++-------------- .../pom.xml | 30 +++++------ pom.xml | 1 + 9 files changed, 55 insertions(+), 79 deletions(-) diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index b0eed15ed..e196d06dd 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -143,7 +143,7 @@ feign.codec;version="[11.0,12)", feign.gson;version="[11.0,12)", feign.slf4j;version="[11.0,12)", - io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}", io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception, io.entgra.device.mgt.plugins.input.adapter.http.util, javax.net.ssl, diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index d06bef139..35ae72688 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -127,12 +127,12 @@ io.entgra.device.mgt.plugins.input.adapter.mqtt.* - io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", - io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}", io.entgra.device.mgt.plugins.input.adapter.mqtt, io.entgra.device.mgt.plugins.input.adapter.mqtt.util, javax.net.ssl, diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index 409aa7c88..b71184d3a 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -103,7 +103,7 @@ ${project.artifactId} io.entgra.device.mgt.plugins.input.adapter.xmpp.internal, - io.entgra.device.mgt.plugins.input.adapter.http.internal.* + io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.* !io.entgra.device.mgt.plugins.input.adapter.xmpp.internal, @@ -111,8 +111,7 @@ io.entgra.device.mgt.plugins.input.adapter.xmpp.* - io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", - io.entgra.device.mgt.plugins.input.adapter.xmpp, + io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}", org.apache.commons.logging;version="[1.2,2)", org.jivesoftware.smack, org.jivesoftware.smack.filter, diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index 5368e960a..8a0dbb348 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -103,10 +103,10 @@ io.entgra.device.mgt.plugins.output.adapter.http.* - io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.plugins.output.adapter.http.util, javax.net.ssl, org.apache.commons.httpclient;version="[3.1,4)", diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 4864912d6..55540e3a1 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -116,11 +116,11 @@ io.entgra.device.mgt.plugins.output.adapter.mqtt.*, - io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.plugins.output.adapter.mqtt, io.entgra.device.mgt.plugins.output.adapter.mqtt.util, javax.net.ssl, diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 250923205..16bb3cab0 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -88,14 +88,14 @@ com.google.gson;version="[2.9,3)", - io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", - io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.core.config;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}", org.apache.commons.logging;version="[1.2,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index 7237a72a3..dd30916d4 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + io.entgra.device.mgt.plugins @@ -29,7 +30,7 @@ 4.0.0 io.entgra.device.mgt.plugins.extension.siddhi.device bundle - Entgra Device Management Plugins - Siddhi Extensions - Device management Core functionality as Siddhi extension + Entgra Device Management Plugins - Siddhi Extensions - Device management Core http://entgra.io @@ -168,26 +169,21 @@ io.entgra.device.mgt.plugins.extension.siddhi.device.* - - - - - feign;version="[11.0,12)", feign.auth;version="[11.0,12)", feign.codec;version="[11.0,12)", feign.gson;version="[11.0,12)", feign.slf4j;version="[11.0,12)", - io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs, io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto, io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception, @@ -198,29 +194,9 @@ javax.security.auth.x500,javax.xml.bind;version="[0.0,1)", javax.xml.bind.annotation;version="[0.0,1)", javax.xml.parsers, - - - - - - - - - - - - - - - org.apache.commons.lang;version="[2.6,3)", org.apache.commons.logging;version="[1.2,2)", - - - org.json;version="[3.0,4)", - - org.w3c.dom, org.wso2.carbon.base;version="[1.0,2)", org.wso2.carbon.context;version="[4.8,5)", diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index 4509b6bc2..d0f30f0e8 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -56,21 +56,21 @@ io.entgra.device.mgt.plugins.mobile.android.internal com.google.gson;version="[2.9,3)", - io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.general;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.push.notification;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.spi;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.general;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.push.notification;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.spi;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource, io.entgra.device.mgt.plugins.mobile.android.impl.dao, io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl, diff --git a/pom.xml b/pom.xml index e44cca0bd..320b80240 100644 --- a/pom.xml +++ b/pom.xml @@ -970,6 +970,7 @@ 7.0.0-SNAPSHOT + [7.0.0, 8.0.0) 4.0.0