From b4a6864c69333d5ffdcad72f6140fadc7739c2bb Mon Sep 17 00:00:00 2001 From: megala21 Date: Mon, 2 Oct 2017 10:20:00 +0530 Subject: [PATCH 01/10] Fixing build failure --- modules/distribution/src/assembly/bin.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 85809762..f503f159 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1992,16 +1992,19 @@ src/core/resources/security/wso2carbon.jks ${pom.artifactId}-${pom.version}/repository/resources/security + false 644 src/core/resources/security/wso2carbon.jks ${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security + false 644 src/core/resources/security/wso2carbon.jks ${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security + false 644 From 914ae3db9350e5c465c59ed4149a469aff88c1ad Mon Sep 17 00:00:00 2001 From: megala21 Date: Tue, 3 Oct 2017 10:32:05 +0530 Subject: [PATCH 02/10] Fixing build failure --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 71f834dd..4a8dab4c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.wso2.iot - wso2iot-parent + wso2iot-parent pom 3.1.1-SNAPSHOT WSO2 IoT - Parent @@ -31,7 +31,7 @@ org.wso2 wso2 - 1 + 2 From 44fff51574369dc52219a5a4c6e99f6cf047dbad Mon Sep 17 00:00:00 2001 From: megala21 Date: Tue, 3 Oct 2017 10:38:08 +0530 Subject: [PATCH 03/10] Refactor --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a8dab4c..1005118e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.wso2.iot - wso2iot-parent + wso2iot-parent pom 3.1.1-SNAPSHOT WSO2 IoT - Parent From 5a401d67a10c03ea23106956a3545c0c24e9330e Mon Sep 17 00:00:00 2001 From: maheshika Date: Tue, 3 Oct 2017 15:22:46 +0530 Subject: [PATCH 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] [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 10/10] [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