From 4039904492404b17e3ab0cc5c444295853bd7c3c Mon Sep 17 00:00:00 2001 From: Charitha Wijesinghe Date: Sun, 10 Jun 2018 17:20:39 +0000 Subject: [PATCH 01/58] Add .gitlab-ci.yml --- .gitlab-ci.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..83d630d4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,58 @@ +# This file is a template, and might need editing before it works on your project. +--- +# Build JAVA applications using Apache Maven (http://maven.apache.org) +# For docker image tags see https://hub.docker.com/_/maven/ +# +# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html +# +# This template will build and test your projects as well as create the documentation. +# +# * Caches downloaded dependencies and plugins between invocation. +# * Verify but don't deploy merge requests. +# * Deploy built artifacts from master branch only. +# * Shows how to use multiple jobs in test stage for verifying functionality +# with multiple JDKs. +# * Uses site:stage to collect the documentation for multi-module projects. +# * Publishes the documentation for `master` branch. + +variables: + # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. + # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. + MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # when running from the command line. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" + +# Cache downloaded dependencies and plugins between builds. +# To keep cache across branches add 'key: "$CI_JOB_NAME"' +cache: + paths: + - .m2/repository + +# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. +# Because some enforcer rules might check dependency convergence and class duplications +# we use `test-compile` here instead of `validate`, so the correct classpath is picked up. +.validate: &validate + stage: build + script: + - 'mvn $MAVEN_CLI_OPTS test-compile' + +# For merge requests do not `deploy` but only run `verify`. +# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html +.verify: &verify + stage: test + script: + - 'mvn $MAVEN_CLI_OPTS verify site site:stage' + except: + - master + +# Validate merge requests using JDK8 +validate:jdk8: + <<: *validate + image: maven:3.3.9-jdk-8 + +# Verify merge requests using JDK8 +verify:jdk8: + <<: *verify + image: maven:3.3.9-jdk-8 From b89f53e8b4f995439dc74639fbc6123e4ac0bd96 Mon Sep 17 00:00:00 2001 From: charitha Date: Sat, 7 Jul 2018 09:25:02 +0530 Subject: [PATCH 02/58] Update configs for entgra --- .gitlab-ci.yml | 56 ++++++++------------------------------------------ pom.xml | 16 +++++++++++++-- 2 files changed, 23 insertions(+), 49 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83d630d4..0fd7bd56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,58 +1,20 @@ -# This file is a template, and might need editing before it works on your project. ---- -# Build JAVA applications using Apache Maven (http://maven.apache.org) -# For docker image tags see https://hub.docker.com/_/maven/ -# -# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html -# -# This template will build and test your projects as well as create the documentation. -# -# * Caches downloaded dependencies and plugins between invocation. -# * Verify but don't deploy merge requests. -# * Deploy built artifacts from master branch only. -# * Shows how to use multiple jobs in test stage for verifying functionality -# with multiple JDKs. -# * Uses site:stage to collect the documentation for multi-module projects. -# * Publishes the documentation for `master` branch. +image: maven:latest variables: - # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. - # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used - # when running from the command line. - # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" + MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode" + MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" -# Cache downloaded dependencies and plugins between builds. -# To keep cache across branches add 'key: "$CI_JOB_NAME"' cache: paths: - - .m2/repository + - .m2/repository/ + - target/ -# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. -# Because some enforcer rules might check dependency convergence and class duplications -# we use `test-compile` here instead of `validate`, so the correct classpath is picked up. -.validate: &validate +build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS test-compile' + - mvn $MAVEN_CLI_OPTS compile -# For merge requests do not `deploy` but only run `verify`. -# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html -.verify: &verify +test: stage: test script: - - 'mvn $MAVEN_CLI_OPTS verify site site:stage' - except: - - master - -# Validate merge requests using JDK8 -validate:jdk8: - <<: *validate - image: maven:3.3.9-jdk-8 - -# Verify merge requests using JDK8 -verify:jdk8: - <<: *verify - image: maven:3.3.9-jdk-8 + - mvn $MAVEN_CLI_OPTS test \ No newline at end of file diff --git a/pom.xml b/pom.xml index ccdf4b18..3fa1c3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.1.28 + 3.1.31-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.1.6 + 4.1.7-SNAPSHOT 6.2.201 @@ -1869,6 +1869,18 @@ false + + entgra.snapshots + Entgra Snapshot Repository + http://104.215.188.88/repository/maven-snapshots/ + + true + daily + + + false + + From 839f4bc2ea54c9c67454d1dcdf42a6f387365e65 Mon Sep 17 00:00:00 2001 From: charitha Date: Sat, 7 Jul 2018 10:24:04 +0530 Subject: [PATCH 03/58] Update configs for entgra --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 83398a65..c2a5c9de 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,8 @@ - -WSO2 IoT Server - - # Welcome to WSO2 IoT Server
- + +[![pipeline status](https://gitlab.com/entgra/product-iots/badges/master/pipeline.svg)](https://gitlab.com/entgra/product-iots/commits/master) WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. From 4d5d79be3a46d9290c888ba43349b5c8830f382b Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 9 Jul 2018 10:24:06 +0530 Subject: [PATCH 04/58] Fixed gitlab ci issue --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fd7bd56..e93af473 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,21 @@ image: maven:latest variables: - MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode" - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" + # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. + # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. + MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # when running from the command line. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version" +# Cache downloaded dependencies and plugins between builds. +# To keep cache across branches add 'key: "$CI_JOB_NAME"' cache: paths: - .m2/repository/ - - target/ build: stage: build script: - - mvn $MAVEN_CLI_OPTS compile - -test: - stage: test - script: - - mvn $MAVEN_CLI_OPTS test \ No newline at end of file + - 'mvn $MAVEN_CLI_OPTS test-compile' \ No newline at end of file From a7bf5a0e91481f3755d5bac09f3564b293710d75 Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 11 Jul 2018 15:19:39 +0530 Subject: [PATCH 05/58] Update Entgra nexus url --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fa1c3ec..15c45495 100644 --- a/pom.xml +++ b/pom.xml @@ -1872,7 +1872,7 @@ entgra.snapshots Entgra Snapshot Repository - http://104.215.188.88/repository/maven-snapshots/ + http://nexus.entgra.io/repository/maven-snapshots/ true daily From b7df56b55d7505b66631092d8754cb097ceb5a56 Mon Sep 17 00:00:00 2001 From: charitha Date: Thu, 20 Sep 2018 15:13:01 +0530 Subject: [PATCH 06/58] Bump device mgt version --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 15c45495..bd02b452 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.1.31-SNAPSHOT + 3.1.40-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.1.7-SNAPSHOT + 4.1.12-SNAPSHOT 6.2.201 @@ -1553,9 +1553,9 @@ 3.1.0 - 7.0.59.wso2v1 + 7.0.85.wso2v1 7.0.34.wso2v2 - 7.0.59.wso2v1 + 7.0.85.wso2v1 2.4 From 86d3b27551b99b153b6228422ea02ded1d896c91 Mon Sep 17 00:00:00 2001 From: charitha Date: Thu, 27 Sep 2018 12:47:43 +0530 Subject: [PATCH 07/58] Update component versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd02b452..e51d2bf0 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,7 +1528,7 @@ 4.7.23 - 3.1.40-SNAPSHOT + 3.1.41-SNAPSHOT [3.1.0, 4.0.0) From dcb393a0fee37e4a1132404c078468d7487814a3 Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 28 Sep 2018 18:19:58 +0000 Subject: [PATCH 08/58] Update device.mgt core and plugin versions --- pom.xml | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index e51d2bf0..d626bbb0 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.1.41-SNAPSHOT + 3.2.0 [3.1.0, 4.0.0) ${project.version} - 4.1.12-SNAPSHOT + 4.2.0 6.2.201 @@ -1684,9 +1684,9 @@ - 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 + https://gitlab.com/entgra/product-iots.git + scm:git:https://gitlab.com/entgra/product-iots.git + scm:git:https://gitlab.com/entgra/product-iots.git HEAD @@ -1868,6 +1868,26 @@ false + + + entgra-nexus + Entgra internal Repository + http://nexus.entgra.io/repository/maven-public/ + + true + daily + ignore + + + + entgra.releases + Entgra internal Repository + http://nexus.entgra.io/repository/maven-releases/ + + true + daily + ignore + entgra.snapshots @@ -1882,5 +1902,14 @@ - + + + maven-snapshots + http://nexus.entgra.io/repository/maven-snapshots/ + + + maven-release + http://nexus.entgra.io/repository/maven-releases/ + + From 08f2368856c16ede6c764030542262a79b4f0971 Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 28 Sep 2018 20:54:59 +0000 Subject: [PATCH 09/58] Update app manager version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d626bbb0..bbd2b44f 100644 --- a/pom.xml +++ b/pom.xml @@ -1640,7 +1640,7 @@ 1.0.1 - 1.2.53 + 1.3.0 1.5.1 From bf79ebfe8524966c254959a178b95a343652c0c5 Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 28 Sep 2018 22:06:28 +0000 Subject: [PATCH 10/58] [maven-release-plugin] prepare release v3.4.0-alpha --- modules/components/org.wso2.iot.core.admin.styles/pom.xml | 2 +- modules/components/pom.xml | 2 +- modules/cxf-filters/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/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 ++-- 16 files changed, 19 insertions(+), 19 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 92d30773..d7edeb31 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index b7da7c5d..bcddce1a 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml index c15c3af3..97bb38da 100644 --- a/modules/cxf-filters/pom.xml +++ b/modules/cxf-filters/pom.xml @@ -19,7 +19,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9be6598e..831d6227 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../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 48972207..9896d590 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 18c62c17..df61b3ae 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9af68ea9..7dd0a878 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 38cec19a..d07588e2 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index e40b8b87..9eba3cdf 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 1478f926..97281f3e 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index d41db6d7..e3a41bd1 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index df9e3885..faf991cc 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml 4.0.0 mobile-qsg - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha 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 424ff938..405769bf 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 23bf276f..94325ead 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.3.0-update1-SNAPSHOT + 3.4.0-alpha ../pom.xml 4.0.0 iot-devicetype-archetype - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha 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 c51b3160..45ba5f6d 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha ../../pom.xml diff --git a/pom.xml b/pom.xml index bbd2b44f..2940956c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.3.0-update1-SNAPSHOT + 3.4.0-alpha WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1687,7 +1687,7 @@ https://gitlab.com/entgra/product-iots.git scm:git:https://gitlab.com/entgra/product-iots.git scm:git:https://gitlab.com/entgra/product-iots.git - HEAD + v3.4.0-alpha From 7247cd3977d6716194f8496e9a71cb406da4ed2b Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 28 Sep 2018 22:07:07 +0000 Subject: [PATCH 11/58] [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/cxf-filters/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 ++-- 21 files changed, 24 insertions(+), 24 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 d7edeb31..e3b452c0 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index bcddce1a..113b7293 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/cxf-filters/pom.xml b/modules/cxf-filters/pom.xml index 97bb38da..7bfc9c17 100644 --- a/modules/cxf-filters/pom.xml +++ b/modules/cxf-filters/pom.xml @@ -19,7 +19,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 831d6227..9c46f61e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-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 9896d590..e5e29c23 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index df61b3ae..f60bd0e2 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 7dd0a878..fab19f16 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index fac6050a..c87376f2 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.3.0-update1-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index a81c6597..b4fff86d 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.3.0-update1-SNAPSHOT + 3.4.0-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 c8b6010c..d97c81ea 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.3.0-update1-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 5804767e..6d673bd7 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.3.0-update1-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index bd2828a5..f643b2ac 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.3.0-update1-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index d07588e2..25bd67ac 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 9eba3cdf..19f2dee3 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 97281f3e..8defe9e9 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index e3a41bd1..80f54948 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index faf991cc..11f1265d 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.4.0-alpha + 3.4.0-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 405769bf..1b021faa 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 94325ead..a4a14f90 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.4.0-alpha + 3.4.0-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.4.0-alpha + 3.4.0-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 45ba5f6d..fa933769 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.4.0-alpha + 3.4.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 2940956c..1401210d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.4.0-alpha + 3.4.0-SNAPSHOT WSO2 IoT - Parent http://wso2.org WSO2 IoT Server @@ -1687,7 +1687,7 @@ https://gitlab.com/entgra/product-iots.git scm:git:https://gitlab.com/entgra/product-iots.git scm:git:https://gitlab.com/entgra/product-iots.git - v3.4.0-alpha + HEAD From 3aabeed65f6b68dccc52c13cf645dd6e239e9a15 Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Wed, 3 Oct 2018 03:25:00 +0000 Subject: [PATCH 12/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e93af473..3e05c1db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,4 +18,4 @@ cache: build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS test-compile' \ No newline at end of file + - 'mvn $MAVEN_CLI_OPTS clean install' \ No newline at end of file From f44133611e9c60af626b036b05a8fa2ff4097b09 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Wed, 3 Oct 2018 04:10:46 +0000 Subject: [PATCH 13/58] Update to latest snapshot versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1401210d..a7df9d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.2.0 + 3.2.1-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.2.0 + 4.2.1-SNAPSHOT 6.2.201 From 23ade2a80af0b9f0314784c7a8176ff7c7af7cf2 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Wed, 3 Oct 2018 04:57:09 +0000 Subject: [PATCH 14/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e05c1db..a26a7131 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # when running from the command line. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version" + MAVEN_CLI_OPTS: "--batch-mode --errors --show-version" # Cache downloaded dependencies and plugins between builds. # To keep cache across branches add 'key: "$CI_JOB_NAME"' @@ -18,4 +18,4 @@ cache: build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS clean install' \ No newline at end of file + - 'mvn $MAVEN_CLI_OPTS test-compile' From 67f5ba92f7707d13c66f571628689e1eb468c329 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Wed, 3 Oct 2018 05:43:36 +0000 Subject: [PATCH 15/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a26a7131..4151d186 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,4 +18,4 @@ cache: build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS test-compile' + - 'mvn $MAVEN_CLI_OPTS clean install' From d711d94d77f16869d816521b73972c2b6d680eaf Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Fri, 5 Oct 2018 07:13:53 +0000 Subject: [PATCH 16/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4151d186..b2a9e0db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:latest +image: maven:3.5-jdk-8 variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. From 66130ab4da51a0e0dc1182b46324e2cc1d85d2a3 Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Fri, 5 Oct 2018 07:34:40 +0000 Subject: [PATCH 17/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2a9e0db..d21c7c44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:3.5-jdk-8 +image: maven:3.3.3 variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. From 112376eab59d4f0c0e1726df143a74d4c3f27435 Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 5 Oct 2018 08:49:08 +0000 Subject: [PATCH 18/58] Update pom.xml --- pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a7df9d3e..b75c608f 100644 --- a/pom.xml +++ b/pom.xml @@ -1640,7 +1640,7 @@ 1.0.1 - 1.3.0 + 1.5.0 1.5.1 @@ -1903,13 +1903,9 @@ - - maven-snapshots - http://nexus.entgra.io/repository/maven-snapshots/ - - maven-release - http://nexus.entgra.io/repository/maven-releases/ + maven-public + http://nexus.entgra.io/repository/maven-public/ From cb6391d95c87b95c6e773b2e35aced9dd7b5e8c4 Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Fri, 5 Oct 2018 08:51:50 +0000 Subject: [PATCH 19/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d21c7c44..ee310c75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:3.3.3 +image: maven:3.5.2 variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. From cf6ffb82d00eef5010d6ffd126bbd92e65ac8d2d Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Fri, 5 Oct 2018 09:06:47 +0000 Subject: [PATCH 20/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee310c75..ce8ab82a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:3.5.2 +image: jamesdbloom/docker-java8-maven variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. From bb89875316f7532dcde1d291455802557365ffc6 Mon Sep 17 00:00:00 2001 From: Milan Harindu Date: Fri, 5 Oct 2018 09:23:59 +0000 Subject: [PATCH 21/58] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce8ab82a..fcf28eb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: jamesdbloom/docker-java8-maven +image: shinyay/docker-mvn-jdk8:3.5.0 variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. From 00c9334d50846bebec75226fca2e2b59c98d840a Mon Sep 17 00:00:00 2001 From: Ace Date: Sat, 6 Oct 2018 15:55:27 +0530 Subject: [PATCH 22/58] Correcting integration test --- .../integration/jmeter/DeviceTypeManagementJMeterTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java index a871e1d2..c342e319 100644 --- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java +++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java @@ -89,7 +89,7 @@ public class DeviceTypeManagementJMeterTestCase extends TestBase { // Allow some time for message delivery Thread.sleep(10000); ArrayList mqttMessages = mqttDeviceSubscriberClient.getMqttMessages(); - Assert.assertEquals("listener did not recieve mqtt messages ", 0, mqttMessages.size()); + Assert.assertEquals("listener did not recieve mqtt messages ", 1, mqttMessages.size()); String topicPub = automationContext.getContextTenant().getDomain() + "/"+deviceType+"/"+deviceId+"/events"; int qos = 2; From e4c9477bf7434b78cb94feda63fe98f37c0b3964 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Fri, 5 Oct 2018 16:05:54 +0530 Subject: [PATCH 23/58] Fix IoT device deploying issue --- .gitlab-ci.yml | 2 +- README.md | 8 +-- .../analytics/samples/device-plugins/pom.xml | 43 ++++++++++++- .../src/assembly/filter.properties | 2 +- .../distribution/src/broker/conf/carbon.xml | 2 +- .../distribution/src/core/bin/carbondump.bat | 2 +- .../distribution/src/core/release-notes.html | 8 +-- .../core/samples/device-plugins-deployer.xml | 64 ++++++++++++++++++- .../scripts/mobile-qsg/resources/Readme.txt | 2 +- pom.xml | 2 +- 10 files changed, 119 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcf28eb6..24c4635d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # As of Maven 3.4.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # when running from the command line. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. MAVEN_CLI_OPTS: "--batch-mode --errors --show-version" diff --git a/README.md b/README.md index c2a5c9de..891478c4 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ http://docs.wso2.com/iot-server. * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded wso2iot-3.3.0.zip file; this will create a folder named ‘wso2iot-3.3.0’. +* Extract the downloaded wso2iot-3.4.0.zip file; this will create a folder named ‘wso2iot-3.4.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * wso2iot-3.3.0/bin/broker.sh [.bat] - * wso2iot-3.3.0/bin/iot-server.sh [.bat] - * wso2iot-3.3.0/bin/analytics.sh [.bat] + * wso2iot-3.4.0/bin/broker.sh [.bat] + * wso2iot-3.4.0/bin/iot-server.sh [.bat] + * wso2iot-3.4.0/bin/analytics.sh [.bat] ### How to Contribute diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml index 9fd1d18a..9a3b1e7b 100644 --- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.analytics.devicemgt-plugins analytics-devicetype-feature-installation - 3.3.0 + 3.4.0 pom Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics http://wso2.org @@ -66,6 +66,11 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version} + @@ -94,6 +99,10 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group + ${carbon.device.mgt.plugin.version} + @@ -199,6 +208,38 @@ false + + entgra-nexus + Entgra internal Repository + http://nexus.entgra.io/repository/maven-public/ + + true + daily + ignore + + + + entgra.releases + Entgra internal Repository + http://nexus.entgra.io/repository/maven-releases/ + + true + daily + ignore + + + + entgra.snapshots + Entgra Snapshot Repository + http://nexus.entgra.io/repository/maven-snapshots/ + + true + daily + + + false + + diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 7d40938e..3ac47c16 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -18,7 +18,7 @@ product.name=WSO2 IoT Server product.key=IoT -product.version=3.3.0 +product.version=3.4.0 product.doc.version=330 carbon.version=4.4.26 diff --git a/modules/distribution/src/broker/conf/carbon.xml b/modules/distribution/src/broker/conf/carbon.xml index 2f64f008..8e0549d3 100755 --- a/modules/distribution/src/broker/conf/carbon.xml +++ b/modules/distribution/src/broker/conf/carbon.xml @@ -36,7 +36,7 @@ - 3.3.0 + 3.4.0 + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version} + @@ -123,6 +131,16 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group + ${carbon.device.mgt.plugin.version} + @@ -156,6 +174,12 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group + ${carbon.device.mgt.plugin.version} + @@ -189,6 +213,12 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group + ${carbon.device.mgt.plugin.version} + @@ -271,6 +301,38 @@ false + + entgra-nexus + Entgra internal Repository + http://nexus.entgra.io/repository/maven-public/ + + true + daily + ignore + + + + entgra.releases + Entgra internal Repository + http://nexus.entgra.io/repository/maven-releases/ + + true + daily + ignore + + + + entgra.snapshots + Entgra Snapshot Repository + http://nexus.entgra.io/repository/maven-snapshots/ + + true + daily + + + false + + diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt index f896b55e..745e68f5 100644 --- a/modules/scripts/mobile-qsg/resources/Readme.txt +++ b/modules/scripts/mobile-qsg/resources/Readme.txt @@ -1,5 +1,5 @@ -WSO2 IoTs 3.3.0 QSG Setup Guide +WSO2 IoTs 3.4.0 QSG Setup Guide --------------------------------- 1. Start the WSO2 IoTS server diff --git a/pom.xml b/pom.xml index b75c608f..d8dcbca3 100644 --- a/pom.xml +++ b/pom.xml @@ -1869,7 +1869,7 @@ false - + entgra-nexus Entgra internal Repository http://nexus.entgra.io/repository/maven-public/ From ab92a2fda64eaef61937b6e8a71554832426ec27 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 8 Oct 2018 10:30:26 +0530 Subject: [PATCH 24/58] Fix script white labeling issue --- modules/scripts/change-ip.sh | 2 +- modules/scripts/change-superadmin-credentials.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh index 705cd4e9..144549e5 100644 --- a/modules/scripts/change-ip.sh +++ b/modules/scripts/change-ip.sh @@ -2,7 +2,7 @@ echo "" echo "----------------------------------------" -echo "WSO2 IoT Server IP configuration tool" +echo "Entgra IoT Server IP configuration tool" echo "----------------------------------------" diff --git a/modules/scripts/change-superadmin-credentials.sh b/modules/scripts/change-superadmin-credentials.sh index 369739cc..d758370a 100755 --- a/modules/scripts/change-superadmin-credentials.sh +++ b/modules/scripts/change-superadmin-credentials.sh @@ -2,7 +2,7 @@ echo "" echo "----------------------------------------" -echo "WSO2 IoT Server Super Admin Credentials Changing tool" +echo "Entgra IoT Server Super Admin Credentials Changing tool" echo "----------------------------------------" From fc21b8a53c710c18be6efecab7fa34cec063c527 Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 8 Oct 2018 10:53:29 +0530 Subject: [PATCH 25/58] Update app manager version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7df9d3e..003f9a0e 100644 --- a/pom.xml +++ b/pom.xml @@ -1640,7 +1640,7 @@ 1.0.1 - 1.3.0 + 1.5.0-SNAPSHOT 1.5.1 From 30182eb230345c929886897dd3f526505bbe0114 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 8 Oct 2018 11:44:59 +0530 Subject: [PATCH 26/58] White labeling Readme --- README.md | 29 +++++++++---------- .../src/assembly/filter.properties | 2 +- .../distribution/src/core/release-notes.html | 22 +++++++------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 891478c4..85b398ae 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# Welcome to WSO2 IoT Server +# Welcome to Entgra IoT Server
[![pipeline status](https://gitlab.com/entgra/product-iots/badges/master/pipeline.svg)](https://gitlab.com/entgra/product-iots/commits/master) -WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. +Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. It also offers a complete and secure enterprise mobility management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both corporate owned, personally enabled (COPE) and employee-owned devices with the bring your own device (BYOD) concept. -WSO2 IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. +Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. Find the online documentation at : -http://docs.wso2.com/iot-server. +https://entgra.atlassian.net/wiki/spaces/IoTS340/overview. -### Key Features of WSO2 IoT Server +### Key Features of Entgra IoT Server #### Generic framework for Device Management * Extensions for registering built-in/custom device types @@ -21,7 +21,7 @@ http://docs.wso2.com/iot-server. * Group, manage and monitor connected devices * Share device operations/data with other users * Distribute and manage applications/firmware of devices -* Edge computing powered by the WSO2 Complex Event Processor (CEP) streaming engine (Siddhi - https://github.com/wso2/siddhi) +* Edge computing powered by the Entgra Complex Event Processor (CEP) streaming engine (Siddhi - https://github.com/wso2/siddhi) * Out of the Box support for some known device types such as Raspberry Pi, Arduino Uno etc. * Supports mobile platforms such as Android, Windows, and iOS. @@ -53,21 +53,20 @@ http://docs.wso2.com/iot-server. * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded wso2iot-3.4.0.zip file; this will create a folder named ‘wso2iot-3.4.0’. +* Extract the downloaded entgraiot-3.4.0.zip file; this will create a folder named ‘entgraiot-3.4.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * wso2iot-3.4.0/bin/broker.sh [.bat] - * wso2iot-3.4.0/bin/iot-server.sh [.bat] - * wso2iot-3.4.0/bin/analytics.sh [.bat] + * entgraiot-3.4.0/bin/broker.sh [.bat] + * entgraiot-3.4.0/bin/iot-server.sh [.bat] + * entgraiot-3.4.0/bin/analytics.sh [.bat] ### How to Contribute -* WSO2 IoT Server code is hosted in [GitHub](https://github.com/wso2/product-iots). -* Please report issues at [IoT Server Git Issues](https://github.com/wso2/product-iots/issues) and Send your pull requests to [development branch](https://github.com/wso2/product-iots). +* Entgra IoT Server code is hosted in [GitLab](https://gitlab.com/entgra/product-iots). +* Please report issues at [IoT Server Git Issues](https://gitlab.com/entgra/product-iots/issues) and Send your pull requests to [development branch](https://gitlab.com/entgra/product-iots). ### Contact us -WSO2 IoT Server developers can be contacted via the mailing lists: +Entgra IoT Server developers can be contacted via the mailing lists: -* WSO2 Developers List : dev@wso2.org -* WSO2 Architecture List : architecture@wso2.org +* Entgra Developers List : dev@entgra.org diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 3ac47c16..e59a6547 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -16,7 +16,7 @@ # under the License. # -product.name=WSO2 IoT Server +product.name=Entgra IoT Server product.key=IoT product.version=3.4.0 product.doc.version=330 diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index 248b03d3..7a85dfb7 100644 --- a/modules/distribution/src/core/release-notes.html +++ b/modules/distribution/src/core/release-notes.html @@ -8,15 +8,15 @@
-

Release Note - WSO2 IoT Server Version 3.4.0

+

Release Note - Entgra IoT Server Version 3.4.0

-

We are pleased to announce WSO2 IoT Server 3.4.0.

+

We are pleased to announce Entgra IoT Server 3.4.0.

-

WSO2 IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.

+

Entgra IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.

These capabilities involve device management, smart analytics, API and app management for devices, transport extensions for MQTT, XMPP and many more.

-

What's new in WSO2 IoTS 3.4.0

+

What's new in Entgra IoTS 3.4.0

Documentation

-Documentations: Entgra IoT Server Documentation +Documentations: Entgra IoT Server Documentation

Known Issues

-The known set of issues this version can be found here. +The known set of issues this version can be found here.

Engaging with Community

@@ -57,7 +55,10 @@ The known set of issues this version can be found