From 2ea3052557442bee4132db06381622ff8a443fd0 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Fri, 1 Sep 2017 17:38:36 +0530 Subject: [PATCH 01/20] updating the device-mgt and device-mgt-plugins repo versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1c970e40..71754684 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.81 + 3.0.102 [3.0.0, 4.0.0) ${project.version} - 4.0.62 + 4.0.72 6.1.95 From eba8ee5ed47f5457bbe7bfff15a8488be5761e07 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Fri, 1 Sep 2017 18:18:40 +0530 Subject: [PATCH 02/20] updating the device-mgt version to include group management fixes. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71754684..39ca9b5d 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,7 +1517,7 @@ 4.7.8 - 3.0.102 + 3.0.103 [3.0.0, 4.0.0) From 3b97d1b2fd22d9de708cc67193d1b3d20f69d30e Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Mon, 4 Sep 2017 11:42:01 +0530 Subject: [PATCH 03/20] Integration test fix for issue wso2/product-iots#1035 --- .../src/test/resources/payloads/user-response-payloads.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json b/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json index b27f0abd..dd426c92 100644 --- a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json +++ b/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json @@ -1,9 +1,10 @@ { "POST": { - "username":"PRIMARY/username123", + "basicUserInfo" : {"username":"PRIMARY/username123", "firstname":"userfirstname", "lastname":"userlastname", - "emailAddress":"user123@gmail.com" + "emailAddress":"user123@gmail.com"}, + "message":"Mail Server is not configured. Email invitation will not be sent." }, "PUT": { "username":"username123", From 0fccc4f96726995f639a5af73ba81171de8d68e2 Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Wed, 6 Sep 2017 16:59:57 +0530 Subject: [PATCH 04/20] Updated device-mgt version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39ca9b5d..a9e8ab09 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,7 +1517,7 @@ 4.7.8 - 3.0.103 + 3.0.106 [3.0.0, 4.0.0) From 26db1eaee0f5ab9547063919efec6c7ee0bd54c3 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Thu, 7 Sep 2017 10:39:18 +0530 Subject: [PATCH 05/20] Fixes wso2/product-iots#1355 --- modules/scripts/change-ip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh index 669a55bb..7519a2b5 100644 --- a/modules/scripts/change-ip.sh +++ b/modules/scripts/change-ip.sh @@ -64,7 +64,7 @@ echo "Completed!!" #-------------------- echo "Changing /repository/deployment/server/jaggeryapps/api-store/site/conf/site.json" -sed -i -e 's/"identityProvider.*/\"identityProviderUrl\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json +sed -i -e 's/"identityProvider.*/\"identityProviderURL\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json echo "Completed!!" #-------------------- From ddf7121315edd5845cd03473ac588de9d91bf311 Mon Sep 17 00:00:00 2001 From: megala21 Date: Fri, 8 Sep 2017 01:51:28 +0530 Subject: [PATCH 06/20] Adding initial jacoco plugin --- .../CarbonServerManagerExtension.java | 3 +- modules/integration/tests-integration/pom.xml | 11 +- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/instrumentation.txt | 3 +- modules/integration/tests-iot-web-ui/pom.xml | 14 --- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/emma.properties | 105 ------------------ pom.xml | 4 +- 8 files changed, 15 insertions(+), 129 deletions(-) delete mode 100644 modules/integration/tests-iot-web-ui/src/test/resources/emma.properties diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java index cc7f1576..5256761b 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java @@ -230,7 +230,8 @@ public class CarbonServerManagerExtension { if(this.isCoverageEnable) { try { log.info("Generating Jacoco code coverage..."); - this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator)); + this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2" + + File.separator + "components" + File.separator + "plugins" + File.separator)); } catch (IOException var7) { log.error("Failed to generate code coverage ", var7); throw new AutomationFrameworkException("Failed to generate code coverage ", var7); diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 2b0ef4d4..044feb65 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -90,18 +90,17 @@ - copy-emma-dependencies + copy-jacoco-dependencies compile copy-dependencies - ${project.build.directory}/emma + ${project.build.directory}/jacoco jar - emma + org.jacoco.agent - copy-secVerifier compile @@ -272,6 +271,10 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 + + org.jacoco + org.jacoco.agent + diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml index 249ba192..0e5fe5a9 100644 --- a/modules/integration/tests-integration/src/test/resources/automation.xml +++ b/modules/integration/tests-integration/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt index 8f3eacdd..4ffdd2fd 100644 --- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt @@ -32,4 +32,5 @@ org.wso2.carbon.certificate.mgt.core_ org.wso2.carbon.email.sender.core_ org.wso2.carbon.identity.jwt.client.extension_ org.wso2.carbon.identity.authenticator.backend.oauth_ -org.wso2.carbon.webapp.authenticator.framework_ \ No newline at end of file +org.wso2.carbon.webapp.authenticator.framework_ +org.wso2.carbon.device.mgt.analytics.dashboard_ \ No newline at end of file diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 76c5611a..49d31d84 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -91,20 +91,6 @@ maven-dependency-plugin - - - copy-emma-dependencies - compile - - copy-dependencies - - - ${project.build.directory}/emma - jar - emma - - - copy-secVerifier compile diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml index af4b314e..e0d27299 100644 --- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml +++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties deleted file mode 100644 index 9c48e81b..00000000 --- a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties +++ /dev/null @@ -1,105 +0,0 @@ -# ------------------------------------------------------------- -# -# for user-editable property overrides use one of these options: -# -# (1) option-specific command line overrides, e.g. -# -Dreport.txt.out.file=coverage.txt -# -# (2) '-p ' command line option, -# -# (3) 'emma.properties' resource placed somewhere in the classpath -# (e.g., in \classes directory -- note that it does -# not exist by default), -# -# (4) '-Demma.*' JVM options, e.g. -# -Demma.report.txt.out.file=coverage.txt -# -# (5) 'emma.properties' JVM option pointing to a properties file -# -Demma.properties=./myproperties.txt -# ------------------------------------------------------------- - -# ------------------------------------------------------------- -# logging properties: - -verbosity.level: none - -# classloading properties: - -#clsload.forced_delegation_filter: -#clsload.through_delegation_filter: -* - -# ------------------------------------------------------------- - -# instrumentation properties: - -instr.exclude_empty_classes: true -instr.exclude_synthetic_methods: true -instr.exclude_bridge_methods: true -instr.do_suid_compensation: true - -# ------------------------------------------------------------- - -# runtime properties: - -rt.control: false -rt.control.host: localhost -#rt.control.port: 44444 - -rt.filelock: true -#rt.filelock.portbase: 59141 -rt.filelock.maxtime: 120000 -rt.filelock.retries: 11 - -# ------------------------------------------------------------- - -# apprunner session data output properties: - -session.out.file: coverage.es -session.out.merge: true - -# ------------------------------------------------------------- - -# runtime coverage data output properties: - -coverage.out.file: coverage.ec -coverage.out.merge: true - -# ------------------------------------------------------------- - -# instr metadata output properties: - -metadata.out.file: coverage.em -metadata.out.merge: true - -# ------------------------------------------------------------- - -# common report defaults: - -report.units: instr -report.depth: method -report.columns: name, line, block, method, class -report.sort: -line,-block,-method,-class,+name -report.metrics: method:40,block:80,line:40,class:100 - -# ------------------------------------------------------------- -# txt report properties: - -report.txt.depth: all -report.txt.columns: class,method,block,line,name -report.txt.out.file: coverage.txt - -# ------------------------------------------------------------- -# html report properties: - -#report.html.out.dir: coverage -#report.html.out.file: /Users/azeez/Desktop/coverage/index.html -report.html.out.encoding: ISO-8859-1 - -# ------------------------------------------------------------- -# xml report properties: - -#report.xml.out.file: coverage.xml -report.xml.out.encoding: UTF-8 -# ------------------------------------------------------------- -# end of file - diff --git a/pom.xml b/pom.xml index a9e8ab09..564f7f37 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.wso2.carbon.automation org.wso2.carbon.automation.engine - ${test.framework.version} + ${platform.integration.utils.version} org.slf4j @@ -1596,7 +1596,7 @@ 4.4.2 4.2.7 3.3.0 - 0.7.4.201502262128 + 0.7.5.201505241946 1.1.1 3.3.2 2.2 From da191f38df3550e64b1a4e54e1537cf90250bcd9 Mon Sep 17 00:00:00 2001 From: megala21 Date: Fri, 8 Sep 2017 02:10:23 +0530 Subject: [PATCH 07/20] Revert "Adding initial jacoco plugin" This reverts commit ddf7121315edd5845cd03473ac588de9d91bf311. --- .../CarbonServerManagerExtension.java | 3 +- modules/integration/tests-integration/pom.xml | 11 +- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/instrumentation.txt | 3 +- modules/integration/tests-iot-web-ui/pom.xml | 14 +++ .../src/test/resources/automation.xml | 2 +- .../src/test/resources/emma.properties | 105 ++++++++++++++++++ pom.xml | 4 +- 8 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 modules/integration/tests-iot-web-ui/src/test/resources/emma.properties diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java index 5256761b..cc7f1576 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java @@ -230,8 +230,7 @@ public class CarbonServerManagerExtension { if(this.isCoverageEnable) { try { log.info("Generating Jacoco code coverage..."); - this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2" - + File.separator + "components" + File.separator + "plugins" + File.separator)); + this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator)); } catch (IOException var7) { log.error("Failed to generate code coverage ", var7); throw new AutomationFrameworkException("Failed to generate code coverage ", var7); diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 044feb65..2b0ef4d4 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -90,17 +90,18 @@ - copy-jacoco-dependencies + copy-emma-dependencies compile copy-dependencies - ${project.build.directory}/jacoco + ${project.build.directory}/emma jar - org.jacoco.agent + emma + copy-secVerifier compile @@ -271,10 +272,6 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 - - org.jacoco - org.jacoco.agent - diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml index 0e5fe5a9..249ba192 100644 --- a/modules/integration/tests-integration/src/test/resources/automation.xml +++ b/modules/integration/tests-integration/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - true + false diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt index 4ffdd2fd..8f3eacdd 100644 --- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt @@ -32,5 +32,4 @@ org.wso2.carbon.certificate.mgt.core_ org.wso2.carbon.email.sender.core_ org.wso2.carbon.identity.jwt.client.extension_ org.wso2.carbon.identity.authenticator.backend.oauth_ -org.wso2.carbon.webapp.authenticator.framework_ -org.wso2.carbon.device.mgt.analytics.dashboard_ \ No newline at end of file +org.wso2.carbon.webapp.authenticator.framework_ \ No newline at end of file diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 49d31d84..76c5611a 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -91,6 +91,20 @@ maven-dependency-plugin + + + copy-emma-dependencies + compile + + copy-dependencies + + + ${project.build.directory}/emma + jar + emma + + + copy-secVerifier compile diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml index e0d27299..af4b314e 100644 --- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml +++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - true + false diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties new file mode 100644 index 00000000..9c48e81b --- /dev/null +++ b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties @@ -0,0 +1,105 @@ +# ------------------------------------------------------------- +# +# for user-editable property overrides use one of these options: +# +# (1) option-specific command line overrides, e.g. +# -Dreport.txt.out.file=coverage.txt +# +# (2) '-p ' command line option, +# +# (3) 'emma.properties' resource placed somewhere in the classpath +# (e.g., in \classes directory -- note that it does +# not exist by default), +# +# (4) '-Demma.*' JVM options, e.g. +# -Demma.report.txt.out.file=coverage.txt +# +# (5) 'emma.properties' JVM option pointing to a properties file +# -Demma.properties=./myproperties.txt +# ------------------------------------------------------------- + +# ------------------------------------------------------------- +# logging properties: + +verbosity.level: none + +# classloading properties: + +#clsload.forced_delegation_filter: +#clsload.through_delegation_filter: -* + +# ------------------------------------------------------------- + +# instrumentation properties: + +instr.exclude_empty_classes: true +instr.exclude_synthetic_methods: true +instr.exclude_bridge_methods: true +instr.do_suid_compensation: true + +# ------------------------------------------------------------- + +# runtime properties: + +rt.control: false +rt.control.host: localhost +#rt.control.port: 44444 + +rt.filelock: true +#rt.filelock.portbase: 59141 +rt.filelock.maxtime: 120000 +rt.filelock.retries: 11 + +# ------------------------------------------------------------- + +# apprunner session data output properties: + +session.out.file: coverage.es +session.out.merge: true + +# ------------------------------------------------------------- + +# runtime coverage data output properties: + +coverage.out.file: coverage.ec +coverage.out.merge: true + +# ------------------------------------------------------------- + +# instr metadata output properties: + +metadata.out.file: coverage.em +metadata.out.merge: true + +# ------------------------------------------------------------- + +# common report defaults: + +report.units: instr +report.depth: method +report.columns: name, line, block, method, class +report.sort: -line,-block,-method,-class,+name +report.metrics: method:40,block:80,line:40,class:100 + +# ------------------------------------------------------------- +# txt report properties: + +report.txt.depth: all +report.txt.columns: class,method,block,line,name +report.txt.out.file: coverage.txt + +# ------------------------------------------------------------- +# html report properties: + +#report.html.out.dir: coverage +#report.html.out.file: /Users/azeez/Desktop/coverage/index.html +report.html.out.encoding: ISO-8859-1 + +# ------------------------------------------------------------- +# xml report properties: + +#report.xml.out.file: coverage.xml +report.xml.out.encoding: UTF-8 +# ------------------------------------------------------------- +# end of file + diff --git a/pom.xml b/pom.xml index 564f7f37..a9e8ab09 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.wso2.carbon.automation org.wso2.carbon.automation.engine - ${platform.integration.utils.version} + ${test.framework.version} org.slf4j @@ -1596,7 +1596,7 @@ 4.4.2 4.2.7 3.3.0 - 0.7.5.201505241946 + 0.7.4.201502262128 1.1.1 3.3.2 2.2 From 6ca109ada7f07558515f9084e4c8658e2e3debd6 Mon Sep 17 00:00:00 2001 From: megala21 Date: Fri, 8 Sep 2017 02:13:08 +0530 Subject: [PATCH 08/20] Adding jacoco plugin --- .../CarbonServerManagerExtension.java | 3 +- modules/integration/tests-integration/pom.xml | 11 +- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/instrumentation.txt | 7 +- modules/integration/tests-iot-web-ui/pom.xml | 14 --- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/emma.properties | 105 ------------------ pom.xml | 4 +- 8 files changed, 19 insertions(+), 129 deletions(-) delete mode 100644 modules/integration/tests-iot-web-ui/src/test/resources/emma.properties diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java index cc7f1576..5256761b 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java @@ -230,7 +230,8 @@ public class CarbonServerManagerExtension { if(this.isCoverageEnable) { try { log.info("Generating Jacoco code coverage..."); - this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator)); + this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2" + + File.separator + "components" + File.separator + "plugins" + File.separator)); } catch (IOException var7) { log.error("Failed to generate code coverage ", var7); throw new AutomationFrameworkException("Failed to generate code coverage ", var7); diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 2b0ef4d4..044feb65 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -90,18 +90,17 @@ - copy-emma-dependencies + copy-jacoco-dependencies compile copy-dependencies - ${project.build.directory}/emma + ${project.build.directory}/jacoco jar - emma + org.jacoco.agent - copy-secVerifier compile @@ -272,6 +271,10 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 + + org.jacoco + org.jacoco.agent + diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml index 249ba192..0e5fe5a9 100644 --- a/modules/integration/tests-integration/src/test/resources/automation.xml +++ b/modules/integration/tests-integration/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt index 8f3eacdd..8e73b3de 100644 --- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt @@ -14,6 +14,7 @@ org.wso2.carbon.device.mgt.input.adapter.extension_ org.wso2.carbon.device.mgt.input.adapter.mqtt_ org.wso2.carbon.device.mgt.input.adapter.thrift_ org.wso2.carbon.device.mgt.input.adapter.xmpp_ +org.wso2.carbon.device.mgt.input.adapter.http_ org.wso2.carbon.device.mgt.mobile.android_ org.wso2.carbon.device.mgt.mobile.windows_ org.wso2.carbon.device.mgt.mqtt.notification.listener_ @@ -32,4 +33,8 @@ org.wso2.carbon.certificate.mgt.core_ org.wso2.carbon.email.sender.core_ org.wso2.carbon.identity.jwt.client.extension_ org.wso2.carbon.identity.authenticator.backend.oauth_ -org.wso2.carbon.webapp.authenticator.framework_ \ No newline at end of file +org.wso2.carbon.webapp.authenticator.framework_ +org.wso2.carbon.device.mgt.analytics.dashboard_ +org.wso2.carbon.complex.policy.decision.point_ +org.wso2.carbon.appmgt.mdm.osgiconnector_ +org.wso2.carbon.appmgt.mdm.restconnector_ diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 76c5611a..49d31d84 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -91,20 +91,6 @@ maven-dependency-plugin - - - copy-emma-dependencies - compile - - copy-dependencies - - - ${project.build.directory}/emma - jar - emma - - - copy-secVerifier compile diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml index af4b314e..e0d27299 100644 --- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml +++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties deleted file mode 100644 index 9c48e81b..00000000 --- a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties +++ /dev/null @@ -1,105 +0,0 @@ -# ------------------------------------------------------------- -# -# for user-editable property overrides use one of these options: -# -# (1) option-specific command line overrides, e.g. -# -Dreport.txt.out.file=coverage.txt -# -# (2) '-p ' command line option, -# -# (3) 'emma.properties' resource placed somewhere in the classpath -# (e.g., in \classes directory -- note that it does -# not exist by default), -# -# (4) '-Demma.*' JVM options, e.g. -# -Demma.report.txt.out.file=coverage.txt -# -# (5) 'emma.properties' JVM option pointing to a properties file -# -Demma.properties=./myproperties.txt -# ------------------------------------------------------------- - -# ------------------------------------------------------------- -# logging properties: - -verbosity.level: none - -# classloading properties: - -#clsload.forced_delegation_filter: -#clsload.through_delegation_filter: -* - -# ------------------------------------------------------------- - -# instrumentation properties: - -instr.exclude_empty_classes: true -instr.exclude_synthetic_methods: true -instr.exclude_bridge_methods: true -instr.do_suid_compensation: true - -# ------------------------------------------------------------- - -# runtime properties: - -rt.control: false -rt.control.host: localhost -#rt.control.port: 44444 - -rt.filelock: true -#rt.filelock.portbase: 59141 -rt.filelock.maxtime: 120000 -rt.filelock.retries: 11 - -# ------------------------------------------------------------- - -# apprunner session data output properties: - -session.out.file: coverage.es -session.out.merge: true - -# ------------------------------------------------------------- - -# runtime coverage data output properties: - -coverage.out.file: coverage.ec -coverage.out.merge: true - -# ------------------------------------------------------------- - -# instr metadata output properties: - -metadata.out.file: coverage.em -metadata.out.merge: true - -# ------------------------------------------------------------- - -# common report defaults: - -report.units: instr -report.depth: method -report.columns: name, line, block, method, class -report.sort: -line,-block,-method,-class,+name -report.metrics: method:40,block:80,line:40,class:100 - -# ------------------------------------------------------------- -# txt report properties: - -report.txt.depth: all -report.txt.columns: class,method,block,line,name -report.txt.out.file: coverage.txt - -# ------------------------------------------------------------- -# html report properties: - -#report.html.out.dir: coverage -#report.html.out.file: /Users/azeez/Desktop/coverage/index.html -report.html.out.encoding: ISO-8859-1 - -# ------------------------------------------------------------- -# xml report properties: - -#report.xml.out.file: coverage.xml -report.xml.out.encoding: UTF-8 -# ------------------------------------------------------------- -# end of file - diff --git a/pom.xml b/pom.xml index a9e8ab09..564f7f37 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.wso2.carbon.automation org.wso2.carbon.automation.engine - ${test.framework.version} + ${platform.integration.utils.version} org.slf4j @@ -1596,7 +1596,7 @@ 4.4.2 4.2.7 3.3.0 - 0.7.4.201502262128 + 0.7.5.201505241946 1.1.1 3.3.2 2.2 From 155276da9bd344f38ebdfd87b907070f2270c389 Mon Sep 17 00:00:00 2001 From: megala21 Date: Fri, 8 Sep 2017 02:14:31 +0530 Subject: [PATCH 09/20] Adding jacoco plugin --- .../CarbonServerManagerExtension.java | 3 +- modules/integration/tests-integration/pom.xml | 11 +- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/instrumentation.txt | 7 +- modules/integration/tests-iot-web-ui/pom.xml | 14 --- .../src/test/resources/automation.xml | 2 +- .../src/test/resources/emma.properties | 105 ------------------ pom.xml | 4 +- 8 files changed, 19 insertions(+), 129 deletions(-) delete mode 100644 modules/integration/tests-iot-web-ui/src/test/resources/emma.properties diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java index cc7f1576..5256761b 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java @@ -230,7 +230,8 @@ public class CarbonServerManagerExtension { if(this.isCoverageEnable) { try { log.info("Generating Jacoco code coverage..."); - this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator)); + this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2" + + File.separator + "components" + File.separator + "plugins" + File.separator)); } catch (IOException var7) { log.error("Failed to generate code coverage ", var7); throw new AutomationFrameworkException("Failed to generate code coverage ", var7); diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 2b0ef4d4..044feb65 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -90,18 +90,17 @@ - copy-emma-dependencies + copy-jacoco-dependencies compile copy-dependencies - ${project.build.directory}/emma + ${project.build.directory}/jacoco jar - emma + org.jacoco.agent - copy-secVerifier compile @@ -272,6 +271,10 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 + + org.jacoco + org.jacoco.agent + diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml index 249ba192..0e5fe5a9 100644 --- a/modules/integration/tests-integration/src/test/resources/automation.xml +++ b/modules/integration/tests-integration/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt index 8f3eacdd..8e73b3de 100644 --- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt @@ -14,6 +14,7 @@ org.wso2.carbon.device.mgt.input.adapter.extension_ org.wso2.carbon.device.mgt.input.adapter.mqtt_ org.wso2.carbon.device.mgt.input.adapter.thrift_ org.wso2.carbon.device.mgt.input.adapter.xmpp_ +org.wso2.carbon.device.mgt.input.adapter.http_ org.wso2.carbon.device.mgt.mobile.android_ org.wso2.carbon.device.mgt.mobile.windows_ org.wso2.carbon.device.mgt.mqtt.notification.listener_ @@ -32,4 +33,8 @@ org.wso2.carbon.certificate.mgt.core_ org.wso2.carbon.email.sender.core_ org.wso2.carbon.identity.jwt.client.extension_ org.wso2.carbon.identity.authenticator.backend.oauth_ -org.wso2.carbon.webapp.authenticator.framework_ \ No newline at end of file +org.wso2.carbon.webapp.authenticator.framework_ +org.wso2.carbon.device.mgt.analytics.dashboard_ +org.wso2.carbon.complex.policy.decision.point_ +org.wso2.carbon.appmgt.mdm.osgiconnector_ +org.wso2.carbon.appmgt.mdm.restconnector_ diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 76c5611a..49d31d84 100644 --- a/modules/integration/tests-iot-web-ui/pom.xml +++ b/modules/integration/tests-iot-web-ui/pom.xml @@ -91,20 +91,6 @@ maven-dependency-plugin - - - copy-emma-dependencies - compile - - copy-dependencies - - - ${project.build.directory}/emma - jar - emma - - - copy-secVerifier compile diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml index af4b314e..e0d27299 100644 --- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml +++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml @@ -32,7 +32,7 @@ - false + true diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties deleted file mode 100644 index 9c48e81b..00000000 --- a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties +++ /dev/null @@ -1,105 +0,0 @@ -# ------------------------------------------------------------- -# -# for user-editable property overrides use one of these options: -# -# (1) option-specific command line overrides, e.g. -# -Dreport.txt.out.file=coverage.txt -# -# (2) '-p ' command line option, -# -# (3) 'emma.properties' resource placed somewhere in the classpath -# (e.g., in \classes directory -- note that it does -# not exist by default), -# -# (4) '-Demma.*' JVM options, e.g. -# -Demma.report.txt.out.file=coverage.txt -# -# (5) 'emma.properties' JVM option pointing to a properties file -# -Demma.properties=./myproperties.txt -# ------------------------------------------------------------- - -# ------------------------------------------------------------- -# logging properties: - -verbosity.level: none - -# classloading properties: - -#clsload.forced_delegation_filter: -#clsload.through_delegation_filter: -* - -# ------------------------------------------------------------- - -# instrumentation properties: - -instr.exclude_empty_classes: true -instr.exclude_synthetic_methods: true -instr.exclude_bridge_methods: true -instr.do_suid_compensation: true - -# ------------------------------------------------------------- - -# runtime properties: - -rt.control: false -rt.control.host: localhost -#rt.control.port: 44444 - -rt.filelock: true -#rt.filelock.portbase: 59141 -rt.filelock.maxtime: 120000 -rt.filelock.retries: 11 - -# ------------------------------------------------------------- - -# apprunner session data output properties: - -session.out.file: coverage.es -session.out.merge: true - -# ------------------------------------------------------------- - -# runtime coverage data output properties: - -coverage.out.file: coverage.ec -coverage.out.merge: true - -# ------------------------------------------------------------- - -# instr metadata output properties: - -metadata.out.file: coverage.em -metadata.out.merge: true - -# ------------------------------------------------------------- - -# common report defaults: - -report.units: instr -report.depth: method -report.columns: name, line, block, method, class -report.sort: -line,-block,-method,-class,+name -report.metrics: method:40,block:80,line:40,class:100 - -# ------------------------------------------------------------- -# txt report properties: - -report.txt.depth: all -report.txt.columns: class,method,block,line,name -report.txt.out.file: coverage.txt - -# ------------------------------------------------------------- -# html report properties: - -#report.html.out.dir: coverage -#report.html.out.file: /Users/azeez/Desktop/coverage/index.html -report.html.out.encoding: ISO-8859-1 - -# ------------------------------------------------------------- -# xml report properties: - -#report.xml.out.file: coverage.xml -report.xml.out.encoding: UTF-8 -# ------------------------------------------------------------- -# end of file - diff --git a/pom.xml b/pom.xml index a9e8ab09..564f7f37 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.wso2.carbon.automation org.wso2.carbon.automation.engine - ${test.framework.version} + ${platform.integration.utils.version} org.slf4j @@ -1596,7 +1596,7 @@ 4.4.2 4.2.7 3.3.0 - 0.7.4.201502262128 + 0.7.5.201505241946 1.1.1 3.3.2 2.2 From c1576021c8babefb9dfdfc7848e4351fcdd1a472 Mon Sep 17 00:00:00 2001 From: Ace Date: Sat, 9 Sep 2017 08:37:24 +0530 Subject: [PATCH 10/20] bumping plugins version to latest --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 564f7f37..f4420105 100644 --- a/pom.xml +++ b/pom.xml @@ -1524,7 +1524,7 @@ ${project.version} - 4.0.72 + 4.0.76 6.1.95 @@ -1629,7 +1629,7 @@ 1.0.1 - 1.2.35 + 1.2.40 1.5.1 From 422b4964fb7c65ac899582e688f4e5575bc886e4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 9 Sep 2017 05:23:19 +0000 Subject: [PATCH 11/20] [maven-release-plugin] prepare release v3.1.0-update2 --- 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 a2f93bf0..c90c0ef0 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 6ed27720..cbb17ed5 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..8349428e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../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 e31a6491..88442ced 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4a0a7301..95edc8ff 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index be6d6ee0..20ed05c8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 5b7fc9b9..9374ab16 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 714dbff1..a82ef274 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../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 57ebf651..cb17cc71 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 044feb65..c6cd4118 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 49d31d84..9345de17 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..0495bd6f 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 2d155d3f..3eca2ccc 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 7b85ce59..725b2ba5 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 06373013..93452dc7 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index a15fde08..e953871f 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml 4.0.0 mobile-qsg - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 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 d579eacd..88154414 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 8ec6c14b..a23c3c95 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.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 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 55dc1ad3..3e772a01 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 ../../pom.xml diff --git a/pom.xml b/pom.xml index f4420105..c304d83d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.1-SNAPSHOT + 3.1.0-UPDATE2 WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1671,7 +1671,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.1.0-update2 From e8a2247e8e1862ade95d4d9501414006c5b725a6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 9 Sep 2017 05:23:33 +0000 Subject: [PATCH 12/20] [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 c90c0ef0..a2f93bf0 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index cbb17ed5..6ed27720 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8349428e..78b795cf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-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 88442ced..e31a6491 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 95edc8ff..4a0a7301 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 20ed05c8..be6d6ee0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 9374ab16..5b7fc9b9 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index a82ef274..714dbff1 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.1.0-UPDATE2 + 3.1.1-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 cb17cc71..57ebf651 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index c6cd4118..044feb65 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 9345de17..49d31d84 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 0495bd6f..460aeb0a 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 3eca2ccc..2d155d3f 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 725b2ba5..7b85ce59 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 93452dc7..06373013 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index e953871f..a15fde08 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.1.0-UPDATE2 + 3.1.1-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 88154414..d579eacd 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index a23c3c95..8ec6c14b 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.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-UPDATE2 + 3.1.1-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 3e772a01..55dc1ad3 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index c304d83d..f4420105 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-UPDATE2 + 3.1.1-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1671,7 +1671,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.1.0-update2 + HEAD From 506c9daca35ebe4401ab16d9e64ead5772c02175 Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Fri, 15 Sep 2017 12:49:15 +0530 Subject: [PATCH 13/20] Updated component versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f4420105..640898d7 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.106 + 3.0.107 [3.0.0, 4.0.0) ${project.version} - 4.0.76 + 4.0.79 6.1.95 From e410d4d9bc2681765a0e93fb3784d866084ecb77 Mon Sep 17 00:00:00 2001 From: megala21 Date: Fri, 15 Sep 2017 17:20:30 +0530 Subject: [PATCH 14/20] Adding test cases for the android status API --- .../NewAndroidDeviceManagementAPI.jmx | 162 ++++++++++++++++++ .../android-enrollment-response-payloads.json | 2 +- pom.xml | 2 +- 3 files changed, 164 insertions(+), 2 deletions(-) diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx index bd736ca4..f6f6147a 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx @@ -2166,6 +2166,15 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", + + + Status of android device that carries the id \u0027d24f870f390352a41000${DeviceID}\u0027 is ACTIVE + + Assertion.response_data + false + 16 + + true @@ -8702,6 +8711,159 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", + + + + + ${host} + ${https_port} + + + https + + /api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID} + DELETE + true + false + true + false + HttpClient4 + false + + + + + + + Authorization + Bearer ${access_token} + + + Content-Type + application/json + + + Accept + application/json + + + + + + + Android device that carries id \u0027d24f870f390352a4${DeviceID}\u0027 has successfully dis-enrolled + + Assertion.response_data + false + 16 + + + + + + + + ${host} + ${https_port} + + + https + + /api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID}/status + GET + true + false + true + false + HttpClient4 + false + + + + + + + Authorization + Bearer ${access_token} + + + Content-Type + application/json + + + Accept + application/json + + + + + + + Status of android device that carries the id \u0027d24f870f390352a4${DeviceID}\u0027 is REMOVED + + Assertion.response_data + false + 16 + + + + + + + + ${host} + ${https_port} + + + https + + /api/device-mgt/android/v1.0/devices/d24f870f390352sssa4${DeviceID}/status + GET + true + false + true + false + HttpClient4 + false + + + + + + + Authorization + Bearer ${access_token} + + + Content-Type + application/json + + + Accept + application/json + + + + + + + No Android device is found upon the id \u0027d24f870f390352sssa4${DeviceID}\u0027 + + Assertion.response_data + true + 16 + + + + + 404 + + Assertion.response_code + false + 8 + + + false diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json b/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json index 2b158a47..86b0b010 100644 --- a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json +++ b/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json @@ -5,7 +5,7 @@ }, "GET": { "responseCode": "OK", - "responseMessage": "Android device that carries the id \u0027d24f870f390352a41234\u0027 is enrolled" + "responseMessage": "Status of android device that carries the id \u0027d24f870f390352a41234\u0027 is ACTIVE" }, "PUT": { "responseCode": "Accepted", diff --git a/pom.xml b/pom.xml index f4420105..82c46fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -1524,7 +1524,7 @@ ${project.version} - 4.0.76 + 4.0.80 6.1.95 From bf023f50a7897b40a3ce90ccc82a95e17d356749 Mon Sep 17 00:00:00 2001 From: Ace Date: Tue, 19 Sep 2017 14:08:29 +0530 Subject: [PATCH 15/20] updating andes and carbon.business.messaging dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 82c46fd2..27adddcc 100644 --- a/pom.xml +++ b/pom.xml @@ -1555,8 +1555,8 @@ ${project.version} - 3.2.19 - 3.2.15 + 3.2.25 + 3.2.16 1.51.0.0 From 2edb44d066819de65529cfd9e9aa5e432f07f821 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 21 Sep 2017 19:45:17 +0530 Subject: [PATCH 16/20] Bumping apimgt,andes,bussiness-messaging versions --- .../distribution/src/core/bin/iot-server.sh | 1 + .../resources/profiles/backend/iot-server.sh | 1 + .../profiles/keymanager/iot-server.sh | 1 + .../resources/profiles/manager/iot-server.sh | 1 + modules/p2-profile/iot-core-profile/pom.xml | 20 +++++++++++++++++++ pom.xml | 6 +++--- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/src/core/bin/iot-server.sh index a3ef3be0..ac4b12e3 100755 --- a/modules/distribution/src/core/bin/iot-server.sh +++ b/modules/distribution/src/core/bin/iot-server.sh @@ -332,6 +332,7 @@ do -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ -Diot.apimstore.https.port="9443" \ + -Dmqtt.broker.https.port="9446" \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? done diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh index c182e1fd..530e0e7f 100755 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh @@ -335,6 +335,7 @@ do -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ -Diot.apimstore.https.port="9443" \ + -Dmqtt.broker.https.port="9446" \ $NODE_PARAMS \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh index b46482d9..897c9b53 100755 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh @@ -335,6 +335,7 @@ do -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ -Diot.apimstore.https.port="9443" \ + -Dmqtt.broker.https.port="9446" \ $NODE_PARAMS \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh index f21aa8d2..0e3483d7 100755 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh @@ -335,6 +335,7 @@ do -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ -Diot.apimstore.https.port="9443" \ + -Dmqtt.broker.https.port="9446" \ $NODE_PARAMS \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 7b85ce59..14884c37 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -755,6 +755,11 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version} + @@ -1633,6 +1638,11 @@ + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group + ${carbon.device.mgt.plugin.version} + @@ -2517,6 +2527,11 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group + ${carbon.device.mgt.plugin.version} + @@ -3147,6 +3162,11 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group + ${carbon.device.mgt.plugin.version} + diff --git a/pom.xml b/pom.xml index 27adddcc..f7bf7374 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,17 +1517,17 @@ 4.7.8 - 3.0.106 + 3.0.112 [3.0.0, 4.0.0) ${project.version} - 4.0.80 + 4.0.82 - 6.1.95 + 6.1.109 (6.0.0,7.0.0] From 4a0454e1c4cde968c152b5d32f36ef323f8ab535 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 22 Sep 2017 10:54:19 +0530 Subject: [PATCH 17/20] [maven-release-plugin] prepare release v3.1.0-update3 --- 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 a2f93bf0..345b479d 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 6ed27720..834017e5 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..85e2aa05 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../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 e31a6491..12997376 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4a0a7301..36197ab4 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index be6d6ee0..5b2ef934 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 5b7fc9b9..7b562a43 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 714dbff1..8ce776b3 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../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 57ebf651..658ac3bb 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 044feb65..8321310b 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 49d31d84..2e503a9e 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..f4c64c0a 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 2d155d3f..1379fe74 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 14884c37..dd58581c 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 06373013..d853595f 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index a15fde08..7b2a53c8 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml 4.0.0 mobile-qsg - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 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 d579eacd..74ccae95 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 8ec6c14b..18091243 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.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 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 55dc1ad3..6b7caf67 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 ../../pom.xml diff --git a/pom.xml b/pom.xml index f7bf7374..55fdc2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.1-SNAPSHOT + 3.1.0-UPDATE3 WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1671,7 +1671,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.1.0-update3 From 4e1f7b54423b71acb2b4f5a37b9199a553da0f45 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 22 Sep 2017 10:54:33 +0530 Subject: [PATCH 18/20] [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 345b479d..a2f93bf0 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 834017e5..6ed27720 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 85e2aa05..78b795cf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-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 12997376..e31a6491 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 36197ab4..4a0a7301 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5b2ef934..be6d6ee0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 7b562a43..5b7fc9b9 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 8ce776b3..714dbff1 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.1.0-UPDATE3 + 3.1.1-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 658ac3bb..57ebf651 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 8321310b..044feb65 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 2e503a9e..49d31d84 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index f4c64c0a..460aeb0a 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 1379fe74..2d155d3f 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index dd58581c..14884c37 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index d853595f..06373013 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 7b2a53c8..a15fde08 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.1.0-UPDATE3 + 3.1.1-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 74ccae95..d579eacd 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 18091243..8ec6c14b 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.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-UPDATE3 + 3.1.1-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 6b7caf67..55dc1ad3 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 55fdc2e7..f7bf7374 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-UPDATE3 + 3.1.1-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1671,7 +1671,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.1.0-update3 + HEAD From d29c33bcd3475f4e1ec6217a9cce34624b3268ad Mon Sep 17 00:00:00 2001 From: maheshika Date: Tue, 26 Sep 2017 09:37:20 +0530 Subject: [PATCH 19/20] Adding Issue Template --- issue_template.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 issue_template.md diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..757e13ef --- /dev/null +++ b/issue_template.md @@ -0,0 +1,18 @@ +**Description:** + + +**Suggested Labels:** + + +**Suggested Assignees:** + + +**Affected Product Version:** + +**OS, DB, other environment details and versions:** + +**Steps to reproduce:** + + +**Related Issues:** + \ No newline at end of file From e187af7381b80184ca3e1e889a1d1f1e12c18fdd Mon Sep 17 00:00:00 2001 From: denuwanthi Date: Tue, 26 Sep 2017 14:44:06 +0530 Subject: [PATCH 20/20] Inherit maven assembly plugin from carbon-parent --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index f7bf7374..71f834dd 100644 --- a/pom.xml +++ b/pom.xml @@ -1760,10 +1760,6 @@ - - maven-assembly-plugin - 3.0.0 - org.apache.maven.plugins maven-project-info-reports-plugin