From e4c9477bf7434b78cb94feda63fe98f37c0b3964 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Fri, 5 Oct 2018 16:05:54 +0530 Subject: [PATCH] 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/