From 08125d8807ddaca91e3113c218ddadb7e21ee950 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Sun, 25 Feb 2018 15:20:11 +0530 Subject: [PATCH 1/5] Updating carbon-device-mgt and carbon-device-mgt-plugins versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index acb796c3..6968d81f 100644 --- a/pom.xml +++ b/pom.xml @@ -1520,14 +1520,14 @@ 4.7.8 - 3.0.220 + 3.0.231 [3.0.0, 4.0.0) ${project.version} - 4.0.125 + 4.0.131 6.1.109 @@ -1632,7 +1632,7 @@ 1.0.1 - 1.2.43 + 1.2.50 1.5.1 From b918776c1da6891f1346841642963465ddc4bf3e Mon Sep 17 00:00:00 2001 From: lasantha Date: Sun, 25 Feb 2018 23:53:36 +0530 Subject: [PATCH 2/5] Fix APPM test case failure Modified the request payload of application adding API call. As a result of adding tags option to the application adding functionality, it is required to change the application adding request payload as well. --- .../jmeter-scripts/AppManagerTest.jmx | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx index a1229ea3..c56a953b 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx @@ -962,6 +962,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -1622,6 +1629,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -1961,6 +1975,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -2248,6 +2269,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -3258,6 +3286,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -3918,6 +3953,13 @@ vars.put("encoded", encoded); true visibility + + false + + = + true + tags + ${server} @@ -4212,4 +4254,4 @@ vars.put("encoded", encoded); - \ No newline at end of file + From c5af021e0cfe9c470f2da912422dc13db8b59e1b Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Mon, 26 Feb 2018 00:17:15 +0530 Subject: [PATCH 3/5] Updating app-manager version into v1.2.51 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6968d81f..5a917b9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1632,7 +1632,7 @@ 1.0.1 - 1.2.50 + 1.2.51 1.5.1 From 2768a0aba8b063adc2da356ef65f55fe9492e702 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 25 Feb 2018 20:07:56 +0000 Subject: [PATCH 4/5] [maven-release-plugin] prepare release v3.2.0-RC2 --- modules/components/org.wso2.iot.core.admin.styles/pom.xml | 2 +- modules/components/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/features/org.wso2.iot.core.styles.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/integration/pom.xml | 2 +- modules/integration/tests-common/integration-common/pom.xml | 2 +- modules/integration/tests-common/pom.xml | 2 +- modules/integration/tests-common/web-ui-pages/pom.xml | 2 +- modules/integration/tests-integration/pom.xml | 2 +- modules/integration/tests-iot-web-ui/pom.xml | 2 +- modules/p2-profile/analytics-profile/pom.xml | 2 +- modules/p2-profile/broker-profile/pom.xml | 2 +- modules/p2-profile/iot-core-profile/pom.xml | 2 +- modules/p2-profile/pom.xml | 2 +- modules/scripts/mobile-qsg/pom.xml | 4 ++-- modules/scripts/pom.xml | 2 +- modules/tools/cdmf-devicetype-archetype/pom.xml | 4 ++-- modules/tools/pom.xml | 2 +- pom.xml | 4 ++-- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/components/org.wso2.iot.core.admin.styles/pom.xml b/modules/components/org.wso2.iot.core.admin.styles/pom.xml index f27b6e74..a602be6e 100644 --- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml +++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-components - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 3a21b508..624dc834 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d8299a59..597a3c30 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/features/org.wso2.iot.core.styles.feature/pom.xml index 45a9ce08..dda3d883 100644 --- a/modules/features/org.wso2.iot.core.styles.feature/pom.xml +++ b/modules/features/org.wso2.iot.core.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-features - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 3e739fb2..0ed7a393 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 3fd19c60..b2b52588 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index a00ec447..9407fb92 100644 --- a/modules/integration/tests-common/integration-common/pom.xml +++ b/modules/integration/tests-common/integration-common/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot tests-common - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 9d84f41e..e2877770 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-integration - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml index cf2dced5..46256008 100644 --- a/modules/integration/tests-common/web-ui-pages/pom.xml +++ b/modules/integration/tests-common/web-ui-pages/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot tests-common - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index d6db9f2f..fe605f65 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-integration - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 28a47adf..35a01f9f 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-integration - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 218493db..449a09b8 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 57903821..ccc13bcb 100644 --- a/modules/p2-profile/broker-profile/pom.xml +++ b/modules/p2-profile/broker-profile/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 80fd2694..705514ce 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 56860722..743e6291 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index ba9719d9..00137c66 100644 --- a/modules/scripts/mobile-qsg/pom.xml +++ b/modules/scripts/mobile-qsg/pom.xml @@ -21,13 +21,13 @@ org.wso2.iot wso2iot-scripts - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml 4.0.0 mobile-qsg - 3.2.0-update1-SNAPSHOT + 3.2.0 WSO2 IoT - QSG Script This includes the tools for IoTs Quick Start Guide jar diff --git a/modules/scripts/pom.xml b/modules/scripts/pom.xml index 2dfc92a9..04271008 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index bb896037..500c5109 100644 --- a/modules/tools/cdmf-devicetype-archetype/pom.xml +++ b/modules/tools/cdmf-devicetype-archetype/pom.xml @@ -20,13 +20,13 @@ org.wso2.iot wso2iot-tools - 3.2.0-update1-SNAPSHOT + 3.2.0 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.2.0-update1-SNAPSHOT + 3.2.0 WSO2 IoT - Device Type Archetype WSO2 IoT Device Type Archetype maven-archetype diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml index 99653cc7..fb34e428 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0-update1-SNAPSHOT + 3.2.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index 5a917b9d..6fb72916 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.2.0-update1-SNAPSHOT + 3.2.0 WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1674,7 +1674,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 + v3.2.0-RC2 From b28862ffb898037dfbb6ab511ff4a5a8ff88f6a2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 25 Feb 2018 20:08:06 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- modules/components/org.wso2.iot.core.admin.styles/pom.xml | 2 +- modules/components/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/features/org.wso2.iot.core.styles.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/integration/pom.xml | 2 +- modules/integration/tests-common/integration-common/pom.xml | 2 +- modules/integration/tests-common/pom.xml | 2 +- modules/integration/tests-common/web-ui-pages/pom.xml | 2 +- modules/integration/tests-integration/pom.xml | 2 +- modules/integration/tests-iot-web-ui/pom.xml | 2 +- modules/p2-profile/analytics-profile/pom.xml | 2 +- modules/p2-profile/broker-profile/pom.xml | 2 +- modules/p2-profile/iot-core-profile/pom.xml | 2 +- modules/p2-profile/pom.xml | 2 +- modules/scripts/mobile-qsg/pom.xml | 4 ++-- modules/scripts/pom.xml | 2 +- modules/tools/cdmf-devicetype-archetype/pom.xml | 4 ++-- modules/tools/pom.xml | 2 +- pom.xml | 4 ++-- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/components/org.wso2.iot.core.admin.styles/pom.xml b/modules/components/org.wso2.iot.core.admin.styles/pom.xml index a602be6e..f27b6e74 100644 --- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml +++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-components - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 624dc834..3a21b508 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 597a3c30..d8299a59 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/features/org.wso2.iot.core.styles.feature/pom.xml index dda3d883..45a9ce08 100644 --- a/modules/features/org.wso2.iot.core.styles.feature/pom.xml +++ b/modules/features/org.wso2.iot.core.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-features - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 0ed7a393..3e739fb2 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b2b52588..3fd19c60 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 9407fb92..a00ec447 100644 --- a/modules/integration/tests-common/integration-common/pom.xml +++ b/modules/integration/tests-common/integration-common/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot tests-common - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index e2877770..9d84f41e 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-integration - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml index 46256008..cf2dced5 100644 --- a/modules/integration/tests-common/web-ui-pages/pom.xml +++ b/modules/integration/tests-common/web-ui-pages/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot tests-common - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index fe605f65..d6db9f2f 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-integration - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 35a01f9f..28a47adf 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-integration - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 449a09b8..218493db 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index ccc13bcb..57903821 100644 --- a/modules/p2-profile/broker-profile/pom.xml +++ b/modules/p2-profile/broker-profile/pom.xml @@ -20,7 +20,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 705514ce..80fd2694 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-p2-profile - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 743e6291..56860722 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 00137c66..ba9719d9 100644 --- a/modules/scripts/mobile-qsg/pom.xml +++ b/modules/scripts/mobile-qsg/pom.xml @@ -21,13 +21,13 @@ org.wso2.iot wso2iot-scripts - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.2.0 + 3.2.0-update1-SNAPSHOT WSO2 IoT - QSG Script This includes the tools for IoTs Quick Start Guide jar diff --git a/modules/scripts/pom.xml b/modules/scripts/pom.xml index 04271008..2dfc92a9 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 500c5109..bb896037 100644 --- a/modules/tools/cdmf-devicetype-archetype/pom.xml +++ b/modules/tools/cdmf-devicetype-archetype/pom.xml @@ -20,13 +20,13 @@ org.wso2.iot wso2iot-tools - 3.2.0 + 3.2.0-update1-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.2.0 + 3.2.0-update1-SNAPSHOT WSO2 IoT - Device Type Archetype WSO2 IoT Device Type Archetype maven-archetype diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml index fb34e428..99653cc7 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.2.0 + 3.2.0-update1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 6fb72916..5a917b9d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.2.0 + 3.2.0-update1-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1674,7 +1674,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 - v3.2.0-RC2 + HEAD