From e179be2f2a02d3c99c3b32fd2feb5abd08a33625 Mon Sep 17 00:00:00 2001 From: madhawap Date: Tue, 8 Aug 2017 05:38:13 +0530 Subject: [PATCH 01/23] Updated carbon device mgt and plugins versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c7e3938c..e70c5d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.57 + 3.0.62 [3.0.0, 4.0.0) ${project.version} - 4.0.47 + 4.0.53 6.1.95 From f3a5ee59f554441d469b361e28caf3ad29c32750 Mon Sep 17 00:00:00 2001 From: madhawap Date: Tue, 8 Aug 2017 05:38:13 +0530 Subject: [PATCH 02/23] Updated carbon device mgt and plugins versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c7e3938c..e70c5d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.57 + 3.0.62 [3.0.0, 4.0.0) ${project.version} - 4.0.47 + 4.0.53 6.1.95 From 5a401d67a10c03ea23106956a3545c0c24e9330e Mon Sep 17 00:00:00 2001 From: maheshika Date: Tue, 3 Oct 2017 15:22:46 +0530 Subject: [PATCH 03/23] Adding Pull Request Template --- pull_request_template.md | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 00000000..9b32185a --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,52 @@ +## Purpose +> Describe the problems, issues, or needs driving this feature/fix and include links to related issues in the following format: Resolves issue1, issue2, etc. + +## Goals +> Describe the solutions that this feature/fix will introduce to resolve the problems described above + +## Approach +> Describe how you are implementing the solutions. Include an animated GIF or screenshot if the change affects the UI (email documentation@wso2.com to review all UI text). Include a link to a Markdown file or Google doc if the feature write-up is too long to paste here. + +## User stories +> Summary of user stories addressed by this change> + +## Release note +> Brief description of the new feature or bug fix as it will appear in the release notes + +## Documentation +> Link(s) to product documentation that addresses the changes of this PR. If no doc impact, enter “N/A” plus brief explanation of why there’s no doc impact + +## Training +> Link to the PR for changes to the training content in https://github.com/wso2/WSO2-Training, if applicable + +## Certification +> Type “Sent” when you have provided new/updated certification questions, plus four answers for each question (correct answer highlighted in bold), based on this change. Certification questions/answers should be sent to certification@wso2.com and NOT pasted in this PR. If there is no impact on certification exams, type “N/A” and explain why. + +## Marketing +> Link to drafts of marketing content that will describe and promote this feature, including product page changes, technical articles, blog posts, videos, etc., if applicable + +## Automation tests + - Unit tests + > Code coverage information + - Integration tests + > Details about the test cases and coverage + +## Security checks + - Followed secure coding standards in http://wso2.com/technical-reports/wso2-secure-engineering-guidelines? yes/no + - Ran FindSecurityBugs plugin and verified report? yes/no + - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? yes/no + +## Samples +> Provide high-level details about the samples related to this feature + +## Related PRs +> List any other related PRs + +## Migrations (if applicable) +> Describe migration steps and platforms on which migration has been tested + +## Test environment +> List all JDK versions, operating systems, databases, and browser/versions on which this feature/fix was tested + +## Learning +> Describe the research phase and any blog posts, patterns, libraries, or add-ons you used to solve the problem. \ No newline at end of file From abbe21f3b76888aa2ce975d245b2265af7bb2092 Mon Sep 17 00:00:00 2001 From: Ace Date: Wed, 4 Oct 2017 14:17:48 +0530 Subject: [PATCH 04/23] Bumping kernel and devicemgt core/plugin dependencies --- modules/distribution/src/assembly/bin.xml | 46 ------------------- .../analytics-profile/carbon.product | 4 +- .../p2-profile/broker-profile/carbon.product | 4 +- .../iot-core-profile/carbon.product | 4 +- pom.xml | 6 +-- 5 files changed, 9 insertions(+), 55 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 85809762..514d928a 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -70,9 +70,6 @@ **/master-datasources.xml **/carbon.xml **/registry.xml - **/client-truststore.jks - **/wso2carbon.jks - **/wso2carbon.jks **/WSO2AM_DB.h2.db **/WSO2DM_DB.h2.db **/lib/httpmime* @@ -253,8 +250,6 @@ **/synapse-configs/** **/web-apps/** **/appm-tenant-conf.xml - **/client-truststore.jks - **/wso2carbon.jks @@ -326,10 +321,6 @@ ${pom.artifactId}-${pom.version}/repository/resources - - **/client-truststore.jks - **/wso2carbon.jks - @@ -697,8 +688,6 @@ **/LICENSE.txt **/release-notes.html **/webapp-mode/WEB-INF/web.xml - **/repository/resources/security/client-truststore.jks - **/repository/resources/security/wso2carbon.jks @@ -988,8 +977,6 @@ **/LICENSE.txt **/release-notes.html **/dbscripts - **/repository/resources/security/client-truststore.jks - **/repository/resources/security/wso2carbon.jks @@ -1972,38 +1959,5 @@ 644 - - - - src/core/resources/security/client-truststore.jks - ${pom.artifactId}-${pom.version}/repository/resources/security - 644 - - - src/core/resources/security/client-truststore.jks - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security - 644 - - - src/core/resources/security/client-truststore.jks - ${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security - 644 - - - src/core/resources/security/wso2carbon.jks - ${pom.artifactId}-${pom.version}/repository/resources/security - 644 - - - src/core/resources/security/wso2carbon.jks - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security - 644 - - - src/core/resources/security/wso2carbon.jks - ${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security - 644 - - diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product index 14d95d8e..cf9cca05 100644 --- a/modules/p2-profile/analytics-profile/carbon.product +++ b/modules/p2-profile/analytics-profile/carbon.product @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product index 14d95d8e..cf9cca05 100644 --- a/modules/p2-profile/broker-profile/carbon.product +++ b/modules/p2-profile/broker-profile/carbon.product @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product index c5a05630..3b6b09ec 100644 --- a/modules/p2-profile/iot-core-profile/carbon.product +++ b/modules/p2-profile/iot-core-profile/carbon.product @@ -2,7 +2,7 @@ +version="4.4.17" useFeatures="true" includeLaunchers="true"> @@ -14,7 +14,7 @@ version="4.4.16" useFeatures="true" includeLaunchers="true"> - + diff --git a/pom.xml b/pom.xml index 71f834dd..bd4cea8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1446,7 +1446,7 @@ - 4.4.16 + 4.4.17 [4.4.0, 4.5.0) 2.2.0 @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.112 + 3.0.135 [3.0.0, 4.0.0) ${project.version} - 4.0.82 + 4.0.87 6.1.109 From d8dbae712a3aaa1a1b7332a1b27784bb972ca705 Mon Sep 17 00:00:00 2001 From: megala21 Date: Wed, 4 Oct 2017 21:00:11 +0530 Subject: [PATCH 05/23] Adding additional wait for exe file creation --- .../CarbonServerManagerExtension.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) 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..ba8151c2 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 @@ -18,6 +18,9 @@ package org.wso2.iot.integration.common.extensions; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.filefilter.DirectoryFileFilter; +import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +39,7 @@ import org.wso2.carbon.automation.extensions.servers.utils.ServerLogReader; import javax.xml.xpath.XPathExpressionException; import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -57,6 +61,7 @@ public class CarbonServerManagerExtension { private static final String CMD_ARG = "cmdArg"; private static int defaultHttpPort = Integer.parseInt("9763"); private static int defaultHttpsPort = Integer.parseInt("9443"); + private static final long COVERAGE_DUMP_WAIT_TIME = 30000; public CarbonServerManagerExtension(AutomationContext context) { this.automationContext = context; @@ -246,6 +251,7 @@ public class CarbonServerManagerExtension { } private void generateCoverageReport(File classesDir) throws IOException, AutomationFrameworkException { + checkJacocoDataFileSizes(FrameworkPathUtil.getJacocoCoverageHome()); CodeCoverageUtils.executeMerge(FrameworkPathUtil.getJacocoCoverageHome(), FrameworkPathUtil.getCoverageMergeFilePath()); ReportGenerator reportGenerator = new ReportGenerator(new File(FrameworkPathUtil.getCoverageMergeFilePath()), classesDir, new File(CodeCoverageUtils.getJacocoReportDirectory()), (File)null); reportGenerator.create(); @@ -374,4 +380,50 @@ public class CarbonServerManagerExtension { } } + + /** + * To check jacoco file sizes and wait for them to get created.. + * + * @param filePath File Path of the jacoco data files. + */ + private void checkJacocoDataFileSizes(String filePath) { + Collection fileSetsCollection = FileUtils + .listFiles(new File(filePath), new RegexFileFilter("[^s]+(." + "(?i)(exec))$"), + DirectoryFileFilter.DIRECTORY); + + for (File inputFile : fileSetsCollection) { + if (inputFile.isDirectory()) { + continue; + } + //retry to check whether exec data file is non empty. + waitForCoverageDumpFileCreation(inputFile); + } + } + + /** + * This is to wait for jacoco exe file creation. + * + * @param file File that need to be created. + */ + private void waitForCoverageDumpFileCreation(File file) { + long currentTime = System.currentTimeMillis(); + long waitTime = currentTime + COVERAGE_DUMP_WAIT_TIME; + + while (waitTime > System.currentTimeMillis()) { + if (file.length() > 0) { + log.info("Execution data file non empty file size in KB : " + file.length() / 1024); + break; + } else { + + try { + log.warn("Execution data file is empty file size in KB : " + file.length() / 1024); + Thread.sleep(500); + } catch (InterruptedException ignored) { + log.warn("Sleep interrupted ", ignored); + } + + } + } + } + } From 605832c96057a980deac9cdc3b09e86c99a87e7f Mon Sep 17 00:00:00 2001 From: megala21 Date: Wed, 4 Oct 2017 21:06:52 +0530 Subject: [PATCH 06/23] Refactoring --- .../common/extensions/CarbonServerManagerExtension.java | 2 -- 1 file changed, 2 deletions(-) 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 ba8151c2..154205b1 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 @@ -414,14 +414,12 @@ public class CarbonServerManagerExtension { log.info("Execution data file non empty file size in KB : " + file.length() / 1024); break; } else { - try { log.warn("Execution data file is empty file size in KB : " + file.length() / 1024); Thread.sleep(500); } catch (InterruptedException ignored) { log.warn("Sleep interrupted ", ignored); } - } } } From c832f2823055ac1e54d745245ad9d5e87404c9c8 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 5 Oct 2017 09:25:57 +0530 Subject: [PATCH 07/23] Updating maven assembly plugin to 3.0.0 --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 5453ec65..22ea2798 100644 --- a/pom.xml +++ b/pom.xml @@ -1760,6 +1760,11 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + org.apache.maven.plugins maven-project-info-reports-plugin From e1b2aec82ca4987b3260357e17370e62108bf939 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 5 Oct 2017 11:24:27 +0530 Subject: [PATCH 08/23] [maven-release-plugin] prepare release v3.1.0-update4 --- 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..4d4055c8 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-UPDATE4 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 6ed27720..418911fc 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-UPDATE4 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..b4cfde2a 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-UPDATE4 ../../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..ce4cef5a 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-UPDATE4 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4a0a7301..52eab08e 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-UPDATE4 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index be6d6ee0..109f92b1 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-UPDATE4 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 5b7fc9b9..991d2c30 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-UPDATE4 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 714dbff1..bde3b5e3 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-UPDATE4 ../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..cf226cbb 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-UPDATE4 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 044feb65..83b8615a 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-UPDATE4 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 49d31d84..cfd399b6 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-UPDATE4 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..61ca2174 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-UPDATE4 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 2d155d3f..cb7df463 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-UPDATE4 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 14884c37..83bb8685 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-UPDATE4 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 06373013..1ce4ce1d 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-UPDATE4 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index a15fde08..486da0fd 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-UPDATE4 ../pom.xml 4.0.0 mobile-qsg - 3.1.1-SNAPSHOT + 3.1.0-UPDATE4 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..743ef917 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-UPDATE4 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 8ec6c14b..9a1a6f6e 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-UPDATE4 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.1-SNAPSHOT + 3.1.0-UPDATE4 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..1bf88b61 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-UPDATE4 ../../pom.xml diff --git a/pom.xml b/pom.xml index 22ea2798..e0a92252 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.1-SNAPSHOT + 3.1.0-UPDATE4 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-update4 From 3ac12ef8de6a07864c620ee8027b846be5fe1fe1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 5 Oct 2017 11:24:43 +0530 Subject: [PATCH 09/23] [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 4d4055c8..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 418911fc..6ed27720 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b4cfde2a..78b795cf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 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 ce4cef5a..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 52eab08e..4a0a7301 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 109f92b1..be6d6ee0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 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 991d2c30..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index bde3b5e3..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-UPDATE4 + 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 cf226cbb..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 83b8615a..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-UPDATE4 + 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 cfd399b6..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-UPDATE4 + 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 61ca2174..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-UPDATE4 + 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 cb7df463..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-UPDATE4 + 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 83bb8685..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 1ce4ce1d..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-UPDATE4 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 486da0fd..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.1.0-UPDATE4 + 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 743ef917..d579eacd 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 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 9a1a6f6e..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-UPDATE4 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-UPDATE4 + 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 1bf88b61..55dc1ad3 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE4 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index e0a92252..22ea2798 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-UPDATE4 + 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-update4 + HEAD From 89adf1e08a4ea0aa7d2a2dbef068a8e0c1e7e54d Mon Sep 17 00:00:00 2001 From: charitha Date: Fri, 6 Oct 2017 13:34:21 +0530 Subject: [PATCH 10/23] Add basics feature to analytics profile --- modules/distribution/pom.xml | 5 +++ .../src/analytics/conf/cdm_config_change.xml | 12 +++++ .../conf/datasources/cdm-datasources.xml | 45 +++++++++++++++++++ .../conf/push_notification_config.xml | 5 +++ modules/distribution/src/assembly/bin.xml | 14 ++++++ .../core/conf/datasources/cdm-datasources.xml | 2 +- modules/p2-profile/analytics-profile/pom.xml | 29 +++++++++++- 7 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 modules/distribution/src/analytics/conf/cdm_config_change.xml create mode 100644 modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml create mode 100644 modules/distribution/src/analytics/conf/push_notification_config.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..482891f0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -292,6 +292,11 @@ ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml src/analytics/conf/datasource_config_change.xml + + ${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + src/analytics/conf/cdm_config_change.xml + diff --git a/modules/distribution/src/analytics/conf/cdm_config_change.xml b/modules/distribution/src/analytics/conf/cdm_config_change.xml new file mode 100644 index 00000000..1dd2d11b --- /dev/null +++ b/modules/distribution/src/analytics/conf/cdm_config_change.xml @@ -0,0 +1,12 @@ + + + + //DeviceMgtConfiguration/PushNotificationConfiguration/PushNotificationProviders + + + + + //DeviceMgtConfiguration/PushNotificationConfiguration + src/analytics/conf/push_notification_config.xml + + \ No newline at end of file diff --git a/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml new file mode 100644 index 00000000..15e7e407 --- /dev/null +++ b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml @@ -0,0 +1,45 @@ + + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + DM_DS + The datasource used for CDM + + jdbc/DM_DS + + + + jdbc:h2:../../repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000 + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + diff --git a/modules/distribution/src/analytics/conf/push_notification_config.xml b/modules/distribution/src/analytics/conf/push_notification_config.xml new file mode 100644 index 00000000..cfa47cb2 --- /dev/null +++ b/modules/distribution/src/analytics/conf/push_notification_config.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 85809762..9c1d6332 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -722,6 +722,13 @@ + + + src/analytics/conf/datasources + + ${pom.artifactId}-${pom.version}/wso2/analytics/conf/datasources + + src/analytics/conf/analytics/spark @@ -1239,6 +1246,13 @@ true 644 + + src/core/conf/etc/device-analytics-config.xml + ${pom.artifactId}-${pom.version}/wso2/analytics/conf/etc + device-analytics-config.xml + true + 644 + src/core/conf/synapse-handlers.xml diff --git a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml index 8a4bb660..fa52911a 100755 --- a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml +++ b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml @@ -29,7 +29,7 @@ - jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 + jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000 wso2carbon wso2carbon org.h2.Driver diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..33061356 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -94,6 +94,15 @@ true true + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.basics.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} + + + org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version} + org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version} @@ -387,6 +396,9 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.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} @@ -443,6 +455,18 @@ true + + org.wso2.carbon.device.mgt.basics.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.email.sender.feature.group + ${carbon.device.mgt.version} + + + org.apache.axis2.transport.mail.feature.group + ${axis2-transports.wso2.version} + org.wso2.carbon.analytics.core.feature.group @@ -826,13 +850,16 @@ org.wso2.extension.siddhi.execution.json.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.extension.siddhi.devicegroup.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group ${carbon.device.mgt.plugin.version} - org.wso2.gpl.siddhi.extension.geo.script.feature.group From db48363e0bf66dbeceac74893f4c5b3203d0e206 Mon Sep 17 00:00:00 2001 From: charitha Date: Fri, 6 Oct 2017 13:35:00 +0530 Subject: [PATCH 11/23] Fixed MQTT dashboard feature location --- modules/p2-profile/iot-core-profile/pom.xml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 14884c37..c128b1d5 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -1637,12 +1637,12 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group + ${carbon.device.mgt.plugin.version} + - - - org.wso2.carbon.andes.extensions.device.mgt.api.feature.group - ${carbon.device.mgt.plugin.version} - @@ -2112,10 +2112,6 @@ org.wso2.carbon.core.runtime.feature.group ${carbon.kernel.version} - - org.wso2.carbon.core.feature.group - ${carbon.kernel.version} - org.wso2.carbon.core.ui.feature.group ${carbon.kernel.version} @@ -2745,10 +2741,6 @@ org.wso2.carbon.core.runtime.feature.group ${carbon.kernel.version} - - org.wso2.carbon.core.feature.group - ${carbon.kernel.version} - org.wso2.carbon.core.ui.feature.group ${carbon.kernel.version} From 0a1d8c91e6bc7a2fb98a2582b2431a5f05f6b53b Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 9 Oct 2017 17:58:03 +0530 Subject: [PATCH 12/23] Add oauth http publisher --- .../src/analytics/conf/output-adapter-change.xml | 16 +++++++++++++++- modules/p2-profile/analytics-profile/pom.xml | 13 ++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml index 89d97b19..87fe69b7 100644 --- a/modules/distribution/src/analytics/conf/output-adapter-change.xml +++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml @@ -2,7 +2,21 @@ /outputEventAdaptersConfig/adapterConfig[@type="websocket"] - + + + 8 + 100 + 20000 + 10000 + 60 + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.gateway.host}:${iot.gateway.https.port}/token + tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin + + + 8 100 diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 33061356..15804c16 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -400,9 +400,12 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.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} - + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.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} + org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version} @@ -854,6 +857,10 @@ org.wso2.extension.siddhi.devicegroup.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.iot.analytics.feature.group + ${carbon.device.mgt.plugin.version} + From f392b7d855956345d368ff0c4ea4ec62929fc97d Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 16 Oct 2017 10:49:01 +0530 Subject: [PATCH 13/23] Removing analytics.dashboard feature from product-iots. --- modules/p2-profile/iot-core-profile/pom.xml | 40 +++------------------ pom.xml | 4 +-- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 14884c37..b92d3570 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -193,9 +193,6 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version} - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} - @@ -746,10 +743,6 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} - - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} @@ -1011,10 +1004,6 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -1621,11 +1610,6 @@ org.wso2.carbon.identity.oauth2.grant.jwt.feature.group ${identity.jwt.extension.version} - - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.cdmf.analytics.feature.group ${carbon.device.mgt.plugin.version} @@ -1637,12 +1621,12 @@ ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group + ${carbon.device.mgt.plugin.version} + - - org.wso2.carbon.andes.extensions.device.mgt.api.feature.group - ${carbon.device.mgt.plugin.version} - @@ -2051,10 +2035,6 @@ org.wso2.carbon.device.mgt.notification.listener.feature.group ${carbon.device.mgt.plugin.version} - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.adapter.feature.group @@ -2481,10 +2461,6 @@ org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.event.stream.feature.group ${carbon.analytics.common.version} @@ -2699,10 +2675,6 @@ org.wso2.carbon.device.mgt.notification.listener.feature.group ${carbon.device.mgt.plugin.version} - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - @@ -3104,10 +3076,6 @@ org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.event.stream.feature.group ${carbon.analytics.common.version} diff --git a/pom.xml b/pom.xml index 22ea2798..920cf10a 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.135 + 3.0.158 [3.0.0, 4.0.0) ${project.version} - 4.0.87 + 4.0.88 6.1.109 From 1ddd7e8b619815fa671b6b24cf1f1a5498885a82 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 16 Oct 2017 21:39:36 +0530 Subject: [PATCH 14/23] Removing the analytics dashboard components from instrumentation. --- .../tests-integration/src/test/resources/instrumentation.txt | 2 -- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt index 8e73b3de..d8c07c05 100644 --- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt @@ -1,5 +1,4 @@ org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization_ -org.wso2.carbon.device.mgt.analytics.dashboard_ org.wso2.carbon.device.mgt.analytics.data.publisher_ org.wso2.carbon.device.mgt.common_ org.wso2.carbon.device.mgt.core_ @@ -34,7 +33,6 @@ 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_ org.wso2.carbon.complex.policy.decision.point_ org.wso2.carbon.appmgt.mdm.osgiconnector_ org.wso2.carbon.appmgt.mdm.restconnector_ diff --git a/pom.xml b/pom.xml index 920cf10a..4e8d7143 100644 --- a/pom.xml +++ b/pom.xml @@ -1516,8 +1516,8 @@ 4.7.8 - - 3.0.158 + + 3.0.144 [3.0.0, 4.0.0) From 73fd3daf0300ce8e92f0aa6542c6f1ef1358fcfa Mon Sep 17 00:00:00 2001 From: madhawap Date: Tue, 31 Oct 2017 15:10:40 +0530 Subject: [PATCH 15/23] Updating devicemgt core and plugin dependencies For the product IoTS update 5 release --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e8d7143..ee989fd4 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.144 + 3.0.170 [3.0.0, 4.0.0) ${project.version} - 4.0.88 + 4.0.91 6.1.109 From e19dc19344a3f8ba1d85738db145365d51dde1c4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 11:03:33 +0000 Subject: [PATCH 16/23] [maven-release-plugin]prepare release v3.1.0-update5 --- 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..9b24337c 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-UPDATE5 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 6ed27720..93f82da2 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-UPDATE5 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..5dd00e38 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-UPDATE5 ../../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..23f478b4 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-UPDATE5 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4a0a7301..a3036962 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-UPDATE5 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index be6d6ee0..474c28a2 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-UPDATE5 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 5b7fc9b9..147e83c3 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-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 714dbff1..c954aa09 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-UPDATE5 ../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..59b8b757 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-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 044feb65..3b06ecbd 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-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index 49d31d84..dd189a8a 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-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..cafbd240 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-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 2d155d3f..865371d2 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-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index b92d3570..92a558ba 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-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 06373013..5f6425fd 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-UPDATE5 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index a15fde08..727bf74d 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-UPDATE5 ../pom.xml 4.0.0 mobile-qsg - 3.1.1-SNAPSHOT + 3.1.0-UPDATE5 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..ec1b9f18 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-UPDATE5 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index 8ec6c14b..d0be36de 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-UPDATE5 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.1-SNAPSHOT + 3.1.0-UPDATE5 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..d3d6e832 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-UPDATE5 ../../pom.xml diff --git a/pom.xml b/pom.xml index ee989fd4..dfc296e3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.1-SNAPSHOT + 3.1.0-UPDATE5 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-update5 From e65536cf51f8a31f8570e9b3996a6cc2803c3bde Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 11:03:47 +0000 Subject: [PATCH 17/23] [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 9b24337c..530dd213 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 93f82da2..575d28b9 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 5dd00e38..6941136e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.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 23f478b4..ffd51945 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a3036962..63421b7c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 474c28a2..373a5ea6 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.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 147e83c3..246c57bb 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index c954aa09..053d8c77 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-UPDATE5 + 3.1.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 59b8b757..7dcce232 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 3b06ecbd..911fdab9 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-UPDATE5 + 3.1.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 dd189a8a..daf5f786 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index cafbd240..06573a60 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 865371d2..9b6d1008 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-UPDATE5 + 3.1.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 92a558ba..476cd629 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 5f6425fd..fda24794 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-UPDATE5 + 3.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 727bf74d..017fd5c0 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.1.0-UPDATE5 + 3.1.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 ec1b9f18..ceb94983 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index d0be36de..dde30e71 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-UPDATE5 + 3.1.0-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-UPDATE5 + 3.1.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 d3d6e832..82a7001a 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index dfc296e3..6b309ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-UPDATE5 + 3.1.0-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-update5 + HEAD From 799b634a0d094eb882a54dd9e138b3ab8d4496cc Mon Sep 17 00:00:00 2001 From: charitha Date: Tue, 31 Oct 2017 20:05:58 +0530 Subject: [PATCH 18/23] Refactoring --- modules/distribution/pom.xml | 10 +++++----- .../src/analytics/conf/output-adapter-change.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2225ad53..af811c78 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -292,11 +292,11 @@ ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml src/analytics/conf/datasource_config_change.xml - - ${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml - ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml - src/analytics/conf/cdm_config_change.xml - + + ${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + src/analytics/conf/cdm_config_change.xml + diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml index 87fe69b7..b1d69837 100644 --- a/modules/distribution/src/analytics/conf/output-adapter-change.xml +++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml @@ -13,7 +13,7 @@ https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} admin - admin + admin From 701e92cde32600ca82bed5f2e4b762bcb4e42ed4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 15:51:34 +0000 Subject: [PATCH 19/23] [maven-release-plugin]prepare release v3.1.0-update5 --- 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 530dd213..9b24337c 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 575d28b9..93f82da2 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index af811c78..ee601e9c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../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 ffd51945..23f478b4 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 63421b7c..a3036962 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 373a5ea6..474c28a2 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml index 246c57bb..147e83c3 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 053d8c77..c954aa09 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-SNAPSHOT + 3.1.0-UPDATE5 ../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 7dcce232..59b8b757 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 911fdab9..3b06ecbd 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml index daf5f786..dd189a8a 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 1c0aa34f..6dc34a7f 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml index 9b6d1008..865371d2 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index cb8e7c73..6aaedcd9 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index fda24794..5f6425fd 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-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 017fd5c0..727bf74d 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml 4.0.0 mobile-qsg - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 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 ceb94983..ec1b9f18 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml index dde30e71..d0be36de 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-SNAPSHOT + 3.1.0-UPDATE5 ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 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 82a7001a..d3d6e832 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 ../../pom.xml diff --git a/pom.xml b/pom.xml index 6b309ca2..dfc296e3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-SNAPSHOT + 3.1.0-UPDATE5 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-update5 From 01d2e037cf30a96c2d8fc791b7ee3146280a84c0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 15:51:49 +0000 Subject: [PATCH 20/23] [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 9b24337c..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/components/pom.xml b/modules/components/pom.xml index 93f82da2..6ed27720 100644 --- a/modules/components/pom.xml +++ b/modules/components/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ee601e9c..65ea1096 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 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 23f478b4..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a3036962..4a0a7301 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 474c28a2..be6d6ee0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 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 147e83c3..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index c954aa09..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-UPDATE5 + 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 59b8b757..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 3b06ecbd..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-UPDATE5 + 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 dd189a8a..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-UPDATE5 + 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 6dc34a7f..15804c16 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-UPDATE5 + 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 865371d2..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-UPDATE5 + 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 6aaedcd9..6d5c8d64 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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 5f6425fd..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-UPDATE5 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml index 727bf74d..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 mobile-qsg - 3.1.0-UPDATE5 + 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 ec1b9f18..d579eacd 100644 --- a/modules/scripts/pom.xml +++ b/modules/scripts/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 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 d0be36de..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-UPDATE5 + 3.1.1-SNAPSHOT ../pom.xml 4.0.0 iot-devicetype-archetype - 3.1.0-UPDATE5 + 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 d3d6e832..55dc1ad3 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -21,7 +21,7 @@ org.wso2.iot wso2iot-parent - 3.1.0-UPDATE5 + 3.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index dfc296e3..ee989fd4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.iot wso2iot-parent pom - 3.1.0-UPDATE5 + 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-update5 + HEAD From dfbd945665708c3f62e077f815a6afdc1fe41ff9 Mon Sep 17 00:00:00 2001 From: Madawa Soysa Date: Thu, 2 Nov 2017 18:25:07 +0530 Subject: [PATCH 21/23] Increasing devicemgt and plugin versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ee989fd4..ba99727c 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.170 + 3.0.171 [3.0.0, 4.0.0) ${project.version} - 4.0.91 + 4.0.92 6.1.109 From bff73d2bb69c18e278301679cd035bff199601c7 Mon Sep 17 00:00:00 2001 From: Madawa Soysa Date: Fri, 3 Nov 2017 16:14:29 +0530 Subject: [PATCH 22/23] Fixing the test case failure occured by reverting the fix for EMM-1298 --- .../jmeter-scripts/NewAndroidDeviceManagementAPI.jmx | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 f6f6147a..b20a2c3d 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 @@ -817,7 +817,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs338 GET false false @@ -852,7 +852,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 DELETE false false @@ -5005,7 +5005,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 GET false false @@ -5119,7 +5119,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 DELETE false false From ae0427c0ac974929681332dfa00bd5922946a7b0 Mon Sep 17 00:00:00 2001 From: madhawap Date: Thu, 16 Nov 2017 21:00:48 +0530 Subject: [PATCH 23/23] Updating devicemgt core and plugin dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ba99727c..5ea4787e 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.171 + 3.0.172 [3.0.0, 4.0.0) ${project.version} - 4.0.92 + 4.0.93 6.1.109