From 4f1e7965b2758d301765836012cf8b953a5da586 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Thu, 1 Dec 2016 09:45:06 +0530 Subject: [PATCH 1/7] adding windows feature --- .../src/resources/plugins/plugins-deployer.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml index 023722f9..75b776c4 100644 --- a/modules/distribution/src/resources/plugins/plugins-deployer.xml +++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml @@ -66,6 +66,9 @@ 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.device.mgt.plugin.version} + @@ -102,6 +105,10 @@ org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.mobile.windows.feature.group + ${carbon.device.mgt.plugin.version} + From 5398c691a77a5bc519decb1eb1a0151fbb1b86e1 Mon Sep 17 00:00:00 2001 From: charitha Date: Thu, 1 Dec 2016 20:16:40 +0530 Subject: [PATCH 2/7] Bump versions to released component versions --- .../distribution/src/resources/plugins/plugins-deployer.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml index 75b776c4..662d5631 100644 --- a/modules/distribution/src/resources/plugins/plugins-deployer.xml +++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.devicemgt-plugins iot-devicetype-feature-installation - 1.0.0 + 1.0.0-ALPHA4 pom Creating custom distribution http://wso2.org @@ -225,6 +225,6 @@ - 3.0.2-SNAPSHOT + 3.0.2 \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8ce33c1..cf6850ea 100644 --- a/pom.xml +++ b/pom.xml @@ -1542,14 +1542,14 @@ 4.6.4 - 2.0.2-SNAPSHOT + 2.0.2 [2.0.0, 3.0.0) 1.0.0-SNAPSHOT - 3.0.2-SNAPSHOT + 3.0.2 6.0.5 From 72e39a96036c138d298dca4e8ae4751273edfb7d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Dec 2016 14:55:56 +0000 Subject: [PATCH 3/7] [maven-release-plugin] prepare release v1.0.0-ALPHA4 --- modules/analytics/distribution/pom.xml | 2 +- modules/analytics/p2-profile-gen/pom.xml | 2 +- modules/analytics/pom.xml | 2 +- modules/broker/distribution/pom.xml | 2 +- modules/broker/p2-profile/pom.xml | 2 +- modules/broker/pom.xml | 2 +- modules/core/distribution/pom.xml | 2 +- .../core/features/org.wso2.iot.core.styles.feature/pom.xml | 2 +- modules/core/features/pom.xml | 2 +- modules/core/iotserver-ui/pom.xml | 2 +- modules/core/p2-profile-gen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/tools/cdmf-devicetype-archetype/pom.xml | 4 ++-- modules/core/tools/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- pom.xml | 6 +++--- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml index c12e7532..b5711a0d 100644 --- a/modules/analytics/distribution/pom.xml +++ b/modules/analytics/distribution/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml index 07a50ae0..1b59dcc1 100644 --- a/modules/analytics/p2-profile-gen/pom.xml +++ b/modules/analytics/p2-profile-gen/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml index 67cb5851..8fb21587 100644 --- a/modules/analytics/pom.xml +++ b/modules/analytics/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../../pom.xml diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml index 090a9eeb..1ffa00bc 100644 --- a/modules/broker/distribution/pom.xml +++ b/modules/broker/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-broker-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml index 66366263..f45ff27e 100644 --- a/modules/broker/p2-profile/pom.xml +++ b/modules/broker/p2-profile/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-broker-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml index aba78ca6..e7953ed5 100644 --- a/modules/broker/pom.xml +++ b/modules/broker/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../../pom.xml diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml index 5ebb3cd8..c00d1525 100644 --- a/modules/core/distribution/pom.xml +++ b/modules/core/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml index 36ced06b..a03d85d5 100644 --- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml +++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-features - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml index e336bd71..1e48e08f 100644 --- a/modules/core/features/pom.xml +++ b/modules/core/features/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml index 0d0d4ca5..8d5c30a7 100644 --- a/modules/core/iotserver-ui/pom.xml +++ b/modules/core/iotserver-ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 5a02f5ef..0476a158 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 52464c0e..ed15f381 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../../pom.xml diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml index bff5eb86..b7905325 100644 --- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml +++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml @@ -20,13 +20,13 @@ org.wso2.iot wso2iot-core-tools - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml 4.0.0 iot-devicetype-archetype - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 WSO2 IoT - Device Type Archetype WSO2 IoT Device Type Archetype maven-archetype diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml index 27585f27..3db2ade6 100644 --- a/modules/core/tools/pom.xml +++ b/modules/core/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 95e2bdb1..233aed62 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 ../../pom.xml diff --git a/pom.xml b/pom.xml index cf6850ea..407cb99e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1546,7 +1546,7 @@ [2.0.0, 3.0.0) - 1.0.0-SNAPSHOT + 1.0.0-ALPHA4 3.0.2 @@ -1696,7 +1696,7 @@ https://github.com/wso2/product-iots.git scm:git:https://github.com/wso2/product-iots.git scm:git:https://github.com/wso2/product-iots.git - HEAD + v1.0.0-ALPHA4 From 58a2eafffb3be9ef3a4119c7a59a37faa3ebbd69 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Dec 2016 14:58:06 +0000 Subject: [PATCH 4/7] [maven-release-plugin] prepare for next development iteration --- modules/analytics/distribution/pom.xml | 2 +- modules/analytics/p2-profile-gen/pom.xml | 2 +- modules/analytics/pom.xml | 2 +- modules/broker/distribution/pom.xml | 2 +- modules/broker/p2-profile/pom.xml | 2 +- modules/broker/pom.xml | 2 +- modules/core/distribution/pom.xml | 2 +- .../core/features/org.wso2.iot.core.styles.feature/pom.xml | 2 +- modules/core/features/pom.xml | 2 +- modules/core/iotserver-ui/pom.xml | 2 +- modules/core/p2-profile-gen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/tools/cdmf-devicetype-archetype/pom.xml | 4 ++-- modules/core/tools/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- pom.xml | 6 +++--- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml index b5711a0d..c12e7532 100644 --- a/modules/analytics/distribution/pom.xml +++ b/modules/analytics/distribution/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml index 1b59dcc1..07a50ae0 100644 --- a/modules/analytics/p2-profile-gen/pom.xml +++ b/modules/analytics/p2-profile-gen/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-analytics-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml index 8fb21587..67cb5851 100644 --- a/modules/analytics/pom.xml +++ b/modules/analytics/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml index 1ffa00bc..090a9eeb 100644 --- a/modules/broker/distribution/pom.xml +++ b/modules/broker/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-broker-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml index f45ff27e..66366263 100644 --- a/modules/broker/p2-profile/pom.xml +++ b/modules/broker/p2-profile/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-broker-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml index e7953ed5..aba78ca6 100644 --- a/modules/broker/pom.xml +++ b/modules/broker/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml index c00d1525..5ebb3cd8 100644 --- a/modules/core/distribution/pom.xml +++ b/modules/core/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml index a03d85d5..36ced06b 100644 --- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml +++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-features - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml index 1e48e08f..e336bd71 100644 --- a/modules/core/features/pom.xml +++ b/modules/core/features/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml index 8d5c30a7..0d0d4ca5 100644 --- a/modules/core/iotserver-ui/pom.xml +++ b/modules/core/iotserver-ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 0476a158..5a02f5ef 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index ed15f381..52464c0e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../../pom.xml diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml index b7905325..bff5eb86 100644 --- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml +++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml @@ -20,13 +20,13 @@ org.wso2.iot wso2iot-core-tools - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT WSO2 IoT - Device Type Archetype WSO2 IoT Device Type Archetype maven-archetype diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml index 3db2ade6..27585f27 100644 --- a/modules/core/tools/pom.xml +++ b/modules/core/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-core-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 233aed62..95e2bdb1 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 407cb99e..cf6850ea 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1546,7 +1546,7 @@ [2.0.0, 3.0.0) - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT 3.0.2 @@ -1696,7 +1696,7 @@ https://github.com/wso2/product-iots.git scm:git:https://github.com/wso2/product-iots.git scm:git:https://github.com/wso2/product-iots.git - v1.0.0-ALPHA4 + HEAD From 6fb07cfe408aa658894122c0af5e66f502b0d02c Mon Sep 17 00:00:00 2001 From: charitha Date: Thu, 1 Dec 2016 20:43:00 +0530 Subject: [PATCH 5/7] Bump versions to next development --- .../distribution/src/resources/plugins/plugins-deployer.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml index 662d5631..c81ed0de 100644 --- a/modules/distribution/src/resources/plugins/plugins-deployer.xml +++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.devicemgt-plugins iot-devicetype-feature-installation - 1.0.0-ALPHA4 + 1.0.0-SNAPSHOT pom Creating custom distribution http://wso2.org @@ -225,6 +225,6 @@ - 3.0.2 + 3.0.3-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index cf6850ea..49d98fd8 100644 --- a/pom.xml +++ b/pom.xml @@ -1542,14 +1542,14 @@ 4.6.4 - 2.0.2 + 2.0.3-SNAPSHOT [2.0.0, 3.0.0) 1.0.0-SNAPSHOT - 3.0.2 + 3.0.3-SNAPSHOT 6.0.5 From 4854851589464125002925d35aa866f21a062d3f Mon Sep 17 00:00:00 2001 From: Chatura Dilan Date: Fri, 2 Dec 2016 14:50:01 +0530 Subject: [PATCH 6/7] bumping the appm version up --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 49d98fd8..01b92275 100644 --- a/pom.xml +++ b/pom.xml @@ -1656,7 +1656,7 @@ 1.0.1 - 1.2.5 + 1.2.7 1.4.4 @@ -1879,4 +1879,4 @@ - \ No newline at end of file + From 0e184a39b1bc3687891e0d294d0ce67e9fd97f0a Mon Sep 17 00:00:00 2001 From: Chatura Dilan Date: Fri, 2 Dec 2016 16:09:36 +0530 Subject: [PATCH 7/7] bumping up appm version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01b92275..9f380a35 100644 --- a/pom.xml +++ b/pom.xml @@ -1656,7 +1656,7 @@ 1.0.1 - 1.2.7 + 1.2.8-SNAPSHOT 1.4.4