Merge branch 'master' into fix-773

7 years ago · f727857cb4
parent abb249e83c bb899b06aa
commit f727857cb4
22 changed files with 56 additions and 28 deletions
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -0,0 +1,15 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 10
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 5
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - in progress
+# Label to use when marking an issue as stale
+staleLabel: Resolution/Stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
--- 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 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-components</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-parent</artifactId>
-		<version>3.1.0-update12-SNAPSHOT</version>
+		<version>3.2.0-update1-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

--- 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 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-features</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/integration-common/pom.xml
+++ b/modules/integration/tests-common/integration-common/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/broker-profile/pom.xml
+++ b/modules/p2-profile/broker-profile/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/scripts/change-superadmin-credentials.sh
+++ b/modules/scripts/change-superadmin-credentials.sh
@ -42,6 +42,11 @@ while [[ -z $val3 || -z $val4 ]]; do #if $val2 is a zero length String
    read val4;
 done

+echo "Changing <IoT_HOME>/conf/cdm-config.xml"
+sed -i -e 's#\(<AdminUsername>\)'$val1'\(</AdminUsername>\)#\1'$val3'\2#g' ../conf/cdm-config.xml
+sed -i -e 's#\(<AdminPassword>\)'$val2'\(</AdminPassword>\)#\1'$val4'\2#g' ../conf/cdm-config.xml
+echo "Completed!!"
+
 echo "Changing <IoT_HOME>/conf/app-manager.xml"
 sed -i -e 's#\(<Username>\)'$val1'\(</Username>\)#\1'$val3'\2#g' ../conf/app-manager.xml
 sed -i -e 's#\(<Password>\)'$val2'\(</Password>\)#\1'$val4'\2#g' ../conf/app-manager.xml
@ -84,6 +89,11 @@ sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g'
 sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
 echo "Completed!!"

+echo "Changing <IoT_HOME>/wso2/analytics/conf/output-event-adapters.xml"
+sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
+sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
+echo "Completed!!"
+
 echo "Changing <IoT_HOME>/conf/user-mgt.xml"
 sed -i -e 's#\(<UserName>\)'$val1'\(</UserName>\)#\1'$val3'\2#g' ../conf/user-mgt.xml
 sed -i -e 's#\(<Password>\)'$val2'\(</Password>\)#\1'$val4'\2#g' ../conf/user-mgt.xml
@ -115,8 +125,8 @@ sed -i -e 's#\(<Password>\)'$val2'\(</Password>\)#\1'$val4'\2#g' ../wso2/broker/
 echo "Completed!!"

 echo "Changing <IoT_HOME>/wso2/broker/conf/broker.xml"
-sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../wso2/broker/conf/broker.xml
-sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/broker/conf/broker.xml
+sed -i -e 's#\(<property name="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../wso2/broker/conf/broker.xml
+sed -i -e 's#\(<property name="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/broker/conf/broker.xml
 echo "Completed!!"

 echo ""
--- a/modules/scripts/mobile-qsg/pom.xml
+++ b/modules/scripts/mobile-qsg/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-scripts</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-qsg</artifactId>
-    <version>3.1.0-update12-SNAPSHOT</version>
+    <version>3.2.0-update1-SNAPSHOT</version>
    <name>WSO2 IoT - QSG Script</name>
    <description>This includes the tools for IoTs Quick Start Guide</description>
    <packaging>jar</packaging>
--- a/modules/scripts/pom.xml
+++ b/modules/scripts/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@ -20,13 +20,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-tools</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.1.0-update12-SNAPSHOT</version>
+    <version>3.2.0-update1-SNAPSHOT</version>
    <name>WSO2 IoT - Device Type Archetype</name>
    <description>WSO2 IoT Device Type Archetype</description>
    <packaging>maven-archetype</packaging>
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-update12-SNAPSHOT</version>
+        <version>3.2.0-update1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -23,7 +23,7 @@
    <groupId>org.wso2.iot</groupId>
    <artifactId>wso2iot-parent</artifactId>
    <packaging>pom</packaging>
-    <version>3.1.0-update12-SNAPSHOT</version>
+    <version>3.2.0-update1-SNAPSHOT</version>
    <name>WSO2 IoT - Parent</name>
    <url>http://wso2.org</url>
    <description>WSO2 IoT Server</description>
@ -1490,7 +1490,8 @@

        <!-- Carbon Identity -->
        <carbon.identity.framework.version>5.7.5</carbon.identity.framework.version>
-        <carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
+        <carbon.identity.framework.version.range>[5.2.0, 6.0.0)
+        </carbon.identity.framework.version.range>
        <identity.local.auth.basicauth.version>5.3.1</identity.local.auth.basicauth.version>
        <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
        <identity.inbound.auth.saml.version>5.3.1</identity.inbound.auth.saml.version>
@ -1498,8 +1499,10 @@
        <identity.inbound.auth.oauth.version>5.3.11</identity.inbound.auth.oauth.version>
        <identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version>
        <identity.user.ws.version>5.1.4</identity.user.ws.version>
-        <identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
-        <identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version>
+        <identity.outbound.auth.requestpath.basicauth.version>5.1.1
+        </identity.outbound.auth.requestpath.basicauth.version>
+        <identity.outbound.auth.requestpath.oauth.version>5.1.1
+        </identity.outbound.auth.requestpath.oauth.version>
        <identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
        <identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
        <identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>
@ -1524,7 +1527,7 @@
        <product.iot.version>${project.version}</product.iot.version>

        <!-- Carbon Device Management Plugins-->
-	<carbon.device.mgt.plugin.version>4.0.125</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.125</carbon.device.mgt.plugin.version>

        <!-- API Management -->
        <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>