From fc702b96b986e89840f9ad2b57d8b3b45da410e4 Mon Sep 17 00:00:00 2001 From: charithag Date: Thu, 11 Feb 2016 15:33:10 +0530 Subject: [PATCH] Bump carbon device mgt plugins version --- modules/distribution/src/assembly/bin.xml | 2 +- .../org.wso2.iot.styles.feature/pom.xml | 8 +-- modules/features/pom.xml | 4 +- modules/iotserver-ui/pom.xml | 4 +- modules/p2-profile-gen/pom.xml | 50 +++++++++---------- .../connectedcup/component/agent/pom.xml | 4 +- .../connectedcup/component/analytics/pom.xml | 3 +- .../connectedcup/component/controller/pom.xml | 4 +- .../connectedcup/component/manager/pom.xml | 4 +- .../connectedcup/component/plugin/pom.xml | 6 +-- .../samples/connectedcup/component/pom.xml | 8 +-- .../samples/connectedcup/component/ui/pom.xml | 3 +- .../feature/connectedcup-feature/pom.xml | 14 +++--- modules/samples/connectedcup/feature/pom.xml | 4 +- modules/samples/connectedcup/pom.xml | 6 +-- .../currentsensor/component/agent/pom.xml | 5 +- .../currentsensor/component/analytics/pom.xml | 3 +- .../component/controller/pom.xml | 5 +- .../currentsensor/component/manager/pom.xml | 5 +- .../currentsensor/component/plugin/pom.xml | 7 +-- .../samples/currentsensor/component/pom.xml | 8 +-- .../currentsensor/component/ui/pom.xml | 4 +- .../currentsensor/feature/feature/pom.xml | 14 +++--- modules/samples/currentsensor/feature/pom.xml | 5 +- modules/samples/currentsensor/pom.xml | 6 +-- modules/samples/installer/device-deployer.xml | 8 +-- pom.xml | 11 ++-- 27 files changed, 105 insertions(+), 100 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 555bad01..c478eb37 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -381,7 +381,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins + ../p2-profile-gen/target/wso2carbon-core-${carbon.device.mgt.plugin.version}/dbscripts/cdm/plugins ${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins diff --git a/modules/features/org.wso2.iot.styles.feature/pom.xml b/modules/features/org.wso2.iot.styles.feature/pom.xml index b7d45a8d..81018e4d 100644 --- a/modules/features/org.wso2.iot.styles.feature/pom.xml +++ b/modules/features/org.wso2.iot.styles.feature/pom.xml @@ -1,6 +1,6 @@ - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.mobile.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version} @@ -421,7 +421,7 @@ - org.wso2.iot:org.wso2.iot.styles.feature:${carbon.iot.device.mgt.version} + org.wso2.iot:org.wso2.iot.styles.feature:${carbon.device.mgt.plugin.version} @@ -831,7 +831,7 @@ org.wso2.iot.styles.feature.group - ${carbon.iot.device.mgt.version} + ${carbon.device.mgt.plugin.version} @@ -888,48 +888,48 @@ org.wso2.carbon.device.mgt.mobile.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.mobile.android.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.mobile.windows.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.mdm.mdmmgt.server.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.androidsense.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.arduino.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} diff --git a/modules/samples/connectedcup/component/agent/pom.xml b/modules/samples/connectedcup/component/agent/pom.xml index b30f6967..5f9b29d1 100644 --- a/modules/samples/connectedcup/component/agent/pom.xml +++ b/modules/samples/connectedcup/component/agent/pom.xml @@ -21,13 +21,13 @@ device-mgt-iot-connectedcup org.wso2.carbon.devicemgt-plugins - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.agent war - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT WSO2 IoTS(Device Types) - Connected Cup Agent Web app http://maven.apache.org diff --git a/modules/samples/connectedcup/component/analytics/pom.xml b/modules/samples/connectedcup/component/analytics/pom.xml index 8526b568..ddb6abab 100644 --- a/modules/samples/connectedcup/component/analytics/pom.xml +++ b/modules/samples/connectedcup/component/analytics/pom.xml @@ -25,12 +25,13 @@ org.wso2.carbon.devicemgt-plugins device-mgt-iot-connectedcup - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.analytics + 2.0.4-SNAPSHOT WSO2 IoTS(Device Types) - Connected Cup Analytics capp pom diff --git a/modules/samples/connectedcup/component/controller/pom.xml b/modules/samples/connectedcup/component/controller/pom.xml index f5f813e3..d8d36cad 100644 --- a/modules/samples/connectedcup/component/controller/pom.xml +++ b/modules/samples/connectedcup/component/controller/pom.xml @@ -23,14 +23,14 @@ device-mgt-iot-connectedcup org.wso2.carbon.devicemgt-plugins - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.controller.service - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT war WSO2 IoTS(Device Types) - Connected Cup Controller Service WSO2 IoTS(Device Types) - Connected Cup Controller Service diff --git a/modules/samples/connectedcup/component/manager/pom.xml b/modules/samples/connectedcup/component/manager/pom.xml index 100e7512..f6afec61 100644 --- a/modules/samples/connectedcup/component/manager/pom.xml +++ b/modules/samples/connectedcup/component/manager/pom.xml @@ -23,13 +23,13 @@ device-mgt-iot-connectedcup org.wso2.carbon.devicemgt-plugins - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.manager.service - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT war WSO2 IoTS(Device Types) - Connected Cup Manager Service WSO2 IoTS(Device Types) - Connected Cup Manager Service diff --git a/modules/samples/connectedcup/component/plugin/pom.xml b/modules/samples/connectedcup/component/plugin/pom.xml index 47c121b8..1c9b911f 100644 --- a/modules/samples/connectedcup/component/plugin/pom.xml +++ b/modules/samples/connectedcup/component/plugin/pom.xml @@ -22,13 +22,13 @@ device-mgt-iot-connectedcup org.wso2.carbon.devicemgt-plugins - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.plugin - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT bundle WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin @@ -57,7 +57,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.iot.device.mgt.version} + ${carbon.device.mgt.plugin.version} IoT Server Impl Bundle org.coffeeking.connectedcup.plugin.internal diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml index f8a5e71b..56052b98 100644 --- a/modules/samples/connectedcup/component/pom.xml +++ b/modules/samples/connectedcup/component/pom.xml @@ -24,13 +24,13 @@ org.wso2.carbon.devicemgt-plugins device.mgt.iot.connectedcup-parent - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 device-mgt-iot-connectedcup - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT pom WSO2 IoTS(Device Types) - Connected Cup Component WSO2 IoTS(Device Types) - Connected Cup Component @@ -71,7 +71,7 @@ org.wso2.carbon.devicemgt-plugins org.coffeeking.connectedcup.plugin - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} provided @@ -97,7 +97,7 @@ org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.iot - ${carbon.iot.device.mgt.version} + ${carbon.device.mgt.plugin.version} system ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar diff --git a/modules/samples/connectedcup/component/ui/pom.xml b/modules/samples/connectedcup/component/ui/pom.xml index 6077708f..c4d28eb6 100644 --- a/modules/samples/connectedcup/component/ui/pom.xml +++ b/modules/samples/connectedcup/component/ui/pom.xml @@ -25,12 +25,13 @@ org.wso2.carbon.devicemgt-plugins device-mgt-iot-connectedcup - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.ui + 2.0.4-SNAPSHOT WSO2 IoTS(Device Types) - Connected Cup UI pom diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml index 175f29ef..ddc676a3 100644 --- a/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml +++ b/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml @@ -25,14 +25,14 @@ org.wso2.carbon.devicemgt-plugins connected-cup-feature-parent - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 org.coffeeking.connectedcup.feature pom - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT WSO2 IoTS(Device Types) - Connected Cup Feature WSO2 IoTS(Device Types) - Connected Cup Feature http://wso2.org @@ -41,27 +41,27 @@ org.wso2.carbon.devicemgt-plugins org.coffeeking.connectedcup.plugin - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins org.coffeeking.connectedcup.manager.service - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war org.wso2.carbon.devicemgt-plugins org.coffeeking.connectedcup.controller.service - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war org.wso2.carbon.devicemgt-plugins org.coffeeking.connectedcup.agent - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war @@ -237,7 +237,7 @@ - org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.plugin:${carbon.iot.device.mgt.version} + org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.plugin:${carbon.device.mgt.plugin.version} diff --git a/modules/samples/connectedcup/feature/pom.xml b/modules/samples/connectedcup/feature/pom.xml index 0f8767b1..48476107 100644 --- a/modules/samples/connectedcup/feature/pom.xml +++ b/modules/samples/connectedcup/feature/pom.xml @@ -23,14 +23,14 @@ org.wso2.carbon.devicemgt-plugins device.mgt.iot.connectedcup-parent - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 connected-cup-feature-parent pom - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT WSO2 IoTS(Device Types) - Connected Cup Feature Parent WSO2 IoTS(Device Types) - Connected Cup Feature Parent http://wso2.org diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml index 760b2668..130adeed 100644 --- a/modules/samples/connectedcup/pom.xml +++ b/modules/samples/connectedcup/pom.xml @@ -31,7 +31,7 @@ org.wso2.carbon.devicemgt-plugins device.mgt.iot.connectedcup-parent - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT pom WSO2 IoTS(Device Types) - Connected Cup Component WSO2 IoTS(Device Types) - Connected Cup Component @@ -230,8 +230,8 @@ 1.0.2 3.0.0.wso2v1 3.8.1.v20120830-144521 - 1.9.2-SNAPSHOT - 1.9.2.SNAPSHOT + 2.0.4-SNAPSHOT + 2.0.4.SNAPSHOT 1.1.1 diff --git a/modules/samples/currentsensor/component/agent/pom.xml b/modules/samples/currentsensor/component/agent/pom.xml index 9b167186..b0ce999c 100644 --- a/modules/samples/currentsensor/component/agent/pom.xml +++ b/modules/samples/currentsensor/component/agent/pom.xml @@ -15,6 +15,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> + @@ -22,13 +23,13 @@ org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 ${groupId}.currentsensor.agent - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${groupId}.currentsensor.agent war diff --git a/modules/samples/currentsensor/component/analytics/pom.xml b/modules/samples/currentsensor/component/analytics/pom.xml index f4039a3b..0f403736 100644 --- a/modules/samples/currentsensor/component/analytics/pom.xml +++ b/modules/samples/currentsensor/component/analytics/pom.xml @@ -25,12 +25,13 @@ org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 ${groupId}.currentsensor.analytics + 2.0.4-SNAPSHOT ${groupId}.currentsensor.analytics pom diff --git a/modules/samples/currentsensor/component/controller/pom.xml b/modules/samples/currentsensor/component/controller/pom.xml index 98a35230..feadb676 100644 --- a/modules/samples/currentsensor/component/controller/pom.xml +++ b/modules/samples/currentsensor/component/controller/pom.xml @@ -15,6 +15,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> + @@ -22,13 +23,13 @@ org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 ${groupId}.currentsensor.controller - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT war ${groupId}.currentsensor.controller API http://wso2.com diff --git a/modules/samples/currentsensor/component/manager/pom.xml b/modules/samples/currentsensor/component/manager/pom.xml index 17301d63..63dc33d3 100644 --- a/modules/samples/currentsensor/component/manager/pom.xml +++ b/modules/samples/currentsensor/component/manager/pom.xml @@ -15,6 +15,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> + @@ -22,14 +23,14 @@ org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 ${groupId}.currentsensor.manager war - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${groupId}.currentsensor.manager http://wso2.org diff --git a/modules/samples/currentsensor/component/plugin/pom.xml b/modules/samples/currentsensor/component/plugin/pom.xml index 35d8e0b5..26f5b266 100644 --- a/modules/samples/currentsensor/component/plugin/pom.xml +++ b/modules/samples/currentsensor/component/plugin/pom.xml @@ -15,18 +15,19 @@ ~ specific language governing permissions and limitations ~ under the License. --> + org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${groupId}.currentsensor.plugin bundle ${groupId}.currentsensor.plugin for CDMF @@ -57,7 +58,7 @@ ${groupId}.currentsensor.plugin ${groupId}.currentsensor.plugin - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT IoT Server Impl Bundle org.homeautomation.currentsensor.plugin.internal diff --git a/modules/samples/currentsensor/component/pom.xml b/modules/samples/currentsensor/component/pom.xml index 6ba42621..8e40ec18 100644 --- a/modules/samples/currentsensor/component/pom.xml +++ b/modules/samples/currentsensor/component/pom.xml @@ -22,11 +22,11 @@ org.homeautomation currentsensor - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${project-base-package}-component WSO2 IoTS(Device Types) - Current Sensor Component pom @@ -64,7 +64,7 @@ org.homeautomation ${project-base-package}.plugin - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT provided @@ -90,7 +90,7 @@ org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.iot - ${carbon.iot.device.mgt.version} + ${carbon.device.mgt.plugin.version} system ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar diff --git a/modules/samples/currentsensor/component/ui/pom.xml b/modules/samples/currentsensor/component/ui/pom.xml index 1632b3c5..c223f92c 100644 --- a/modules/samples/currentsensor/component/ui/pom.xml +++ b/modules/samples/currentsensor/component/ui/pom.xml @@ -25,12 +25,12 @@ org.homeautomation ${project-base-package}-component - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${groupId}.currentsensor.ui ${groupId}.currentsensor.ui pom diff --git a/modules/samples/currentsensor/feature/feature/pom.xml b/modules/samples/currentsensor/feature/feature/pom.xml index 16465679..1a4b677a 100644 --- a/modules/samples/currentsensor/feature/feature/pom.xml +++ b/modules/samples/currentsensor/feature/feature/pom.xml @@ -23,12 +23,12 @@ org.homeautomation feature - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml 4.0.0 - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ${groupId}.currentsensor.feature pom ${project.artifactId} @@ -38,24 +38,24 @@ org.homeautomation ${project-base-package}.plugin - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} org.homeautomation ${project-base-package}.manager - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war org.homeautomation ${project-base-package}.controller - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war org.homeautomation ${project-base-package}.agent - 1.9.2-SNAPSHOT + ${carbon.device.mgt.plugin.version} war @@ -225,7 +225,7 @@ - org.homeautomation:${project-base-package}.plugin:1.9.2-SNAPSHOT + org.homeautomation:${project-base-package}.plugin:${carbon.device.mgt.plugin.version} diff --git a/modules/samples/currentsensor/feature/pom.xml b/modules/samples/currentsensor/feature/pom.xml index 71292345..2580438b 100644 --- a/modules/samples/currentsensor/feature/pom.xml +++ b/modules/samples/currentsensor/feature/pom.xml @@ -17,20 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> + org.homeautomation currentsensor - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml feature 4.0.0 pom - + 2.0.4-SNAPSHOT feature diff --git a/modules/samples/currentsensor/pom.xml b/modules/samples/currentsensor/pom.xml index d8876f0a..6826014d 100644 --- a/modules/samples/currentsensor/pom.xml +++ b/modules/samples/currentsensor/pom.xml @@ -28,7 +28,7 @@ org.homeautomation currentsensor - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT pom 4.0.0 http://wso2.com @@ -161,8 +161,8 @@ 1.0.2 3.0.0.wso2v1 3.8.1.v20120830-144521 - 1.9.2-SNAPSHOT - 1.9.2.SNAPSHOT + 2.0.4-SNAPSHOT + 2.0.4.SNAPSHOT 1.1.1 2.4 diff --git a/modules/samples/installer/device-deployer.xml b/modules/samples/installer/device-deployer.xml index e9fd67be..583a9282 100644 --- a/modules/samples/installer/device-deployer.xml +++ b/modules/samples/installer/device-deployer.xml @@ -60,10 +60,10 @@ - org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:1.9.2-SNAPSHOT + org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:2.0.4-SNAPSHOT - org.homeautomation:org.homeautomation.currentsensor.feature:1.9.2-SNAPSHOT + org.homeautomation:org.homeautomation.currentsensor.feature:2.0.4-SNAPSHOT @@ -92,11 +92,11 @@ org.coffeeking.connectedcup.feature.group - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT org.homeautomation.currentsensor.feature.group - 1.9.2-SNAPSHOT + 2.0.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 45f15b0e..ab9d8374 100644 --- a/pom.xml +++ b/pom.xml @@ -307,7 +307,7 @@ org.wso2.iot org.wso2.carbon.iot.integration.ui.pages - ${carbon.iot.device.mgt.version} + ${carbon.device.mgt.plugin.version} test @@ -512,7 +512,7 @@ org.wso2.carbon.devicemgt-plugins org.wso2.carbon.device.mgt.mobile - ${carbon.mobile.device.mgt.version} + ${carbon.device.mgt.plugin.version} @@ -1049,13 +1049,10 @@ 1.1.0-SNAPSHOT [0.8.0, 2.0.0) - - 1.9.2-SNAPSHOT + + 2.0.4-SNAPSHOT 2.0.0-SNAPSHOT - - 1.0.0-SNAPSHOT - 4.3.2-SNAPSHOT