community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-773

Browse Source
merge-requests/1/head
Rasika Perera 7 years ago committed by GitHub
parent abb249e83c bb899b06aa
commit f727857cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File

15
.github/stale.yml vendored
Unescape View File

@ -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

2
modules/components/org.wso2.iot.core.admin.styles/pom.xml
Unescape View File

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

2
modules/components/pom.xml
Unescape View File

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

2
modules/distribution/pom.xml
Unescape View File

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

2
modules/features/org.wso2.iot.core.styles.feature/pom.xml
Unescape View File

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

2
modules/features/pom.xml
Unescape View File

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

2
modules/integration/pom.xml
Unescape View File

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

2
modules/integration/tests-common/integration-common/pom.xml
Unescape View File

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

2
modules/integration/tests-common/pom.xml
Unescape View File

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

2
modules/integration/tests-common/web-ui-pages/pom.xml
Unescape View File

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

2
modules/integration/tests-integration/pom.xml
Unescape View File

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

2
modules/integration/tests-iot-web-ui/pom.xml
Unescape View File

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

2
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/broker-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/pom.xml
Unescape View File

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

14
modules/scripts/change-superadmin-credentials.sh
Unescape View File

@ -42,6 +42,11 @@ while [[ -z $val3 || -z $val4 ]]; do #if $val2 is a zero length String
read val4; read val4;
done 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" 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#\(<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 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 sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
echo "Completed!!" 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" 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#\(<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 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 "Completed!!"
echo "Changing <IoT_HOME>/wso2/broker/conf/broker.xml" 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 name="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="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/broker/conf/broker.xml
echo "Completed!!" echo "Completed!!"
echo "" echo ""

4
modules/scripts/mobile-qsg/pom.xml
Unescape View File

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

2
modules/scripts/pom.xml
Unescape View File

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

4
modules/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

@ -20,13 +20,13 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-tools</artifactId> <artifactId>wso2iot-tools</artifactId>
<version>3.1.0-update12-SNAPSHOT</version> <version>3.2.0-update1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>iot-devicetype-archetype</artifactId> <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> <name>WSO2 IoT - Device Type Archetype</name>
<description>WSO2 IoT Device Type Archetype</description> <description>WSO2 IoT Device Type Archetype</description>
<packaging>maven-archetype</packaging> <packaging>maven-archetype</packaging>

2
modules/tools/pom.xml
Unescape View File

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

11
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.1.0-update12-SNAPSHOT</version> <version>3.2.0-update1-SNAPSHOT</version>
<name>WSO2 IoT - Parent</name> <name>WSO2 IoT - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 IoT Server</description> <description>WSO2 IoT Server</description>
@ -1490,7 +1490,8 @@
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.7.5</carbon.identity.framework.version> <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.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.openid.version>5.1.1</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.3.1</identity.inbound.auth.saml.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.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.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.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.basicauth.version>5.1.1
<identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version> </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.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
<identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.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> <identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>

Write Preview
Loading…
Cancel
Save