Commit Graph

2706 Commits

Author SHA1 Message Date
lasanthaDLPDS
715ca227cc Add new app manager componennts bundling 2019-03-03 08:44:51 +05:30
charitha
3568c66fd1 Fix duplicate api scope issue in windows 2019-02-20 09:20:32 +05:30
Charitha Goonetilleke
7b527a9fba Update .gitlab-ci.yml 2019-01-26 05:44:17 +00:00
charitha
d842671be0 Remove custom m2 settings 2019-01-26 08:48:43 +05:30
charitha
6c8ae7d8db Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-26 08:46:37 +05:30
charitha
1758a1d512 Use Entgra builder for CI/CD 2019-01-26 08:46:24 +05:30
charitha
4ed9e5a171 Update to development versions 2019-01-26 08:46:02 +05:30
lasanthaDLPDS
e85e6a462d Modify feature deploying 2019-01-03 12:03:53 +05:30
Entgra Builder
86a384dbdb [maven-release-plugin] prepare for next development iteration 2018-11-11 18:17:22 +00:00
Entgra Builder
187c3579fe [maven-release-plugin] prepare release v3.4.0 2018-11-11 18:17:18 +00:00
charitha
bbe29a0016 Update app mgt version 2018-11-11 21:39:14 +05:30
charitha
1c09441b52 Update component versions for release 2018-11-11 20:36:56 +05:30
charitha
96bcf74d5c Merge branch 'master' of https://github.com/wso2/product-iot-server into entgra-master
# Conflicts:
#	modules/components/org.wso2.iot.core.admin.styles/pom.xml
#	modules/components/pom.xml
#	modules/cxf-filters/pom.xml
#	modules/distribution/pom.xml
#	modules/distribution/src/assembly/filter.properties
#	modules/features/org.wso2.iot.core.styles.feature/pom.xml
#	modules/features/pom.xml
#	modules/integration/pom.xml
#	modules/integration/tests-common/integration-common/pom.xml
#	modules/integration/tests-common/pom.xml
#	modules/integration/tests-common/web-ui-pages/pom.xml
#	modules/integration/tests-integration/pom.xml
#	modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java
#	modules/integration/tests-iot-web-ui/pom.xml
#	modules/p2-profile/analytics-profile/pom.xml
#	modules/p2-profile/broker-profile/pom.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	modules/p2-profile/pom.xml
#	modules/scripts/mobile-qsg/pom.xml
#	modules/scripts/pom.xml
#	modules/tools/cdmf-devicetype-archetype/pom.xml
#	modules/tools/pom.xml
#	pom.xml
2018-11-11 19:55:48 +05:30
WSO2 Builder
08219aafee [maven-release-plugin] prepare for next development iteration 2018-10-31 11:24:30 +00:00
WSO2 Builder
5eac09ee38 [maven-release-plugin] prepare release v3.3.1-rc1 2018-10-31 11:24:19 +00:00
Geeth
0a690f82b3
Merge pull request #1884 from geethkokila/master
Updating the versions
2018-10-31 15:05:14 +05:30
geethkokila
6491894e3f Update the version 2018-10-31 15:04:25 +05:30
geethkokila
6f2647db74 Updating the versions 2018-10-31 10:43:27 +05:30
Geeth
36457f724c
Merge pull request #1883 from geethkokila/master
Updating the versions
2018-10-30 15:07:28 +05:30
geethkokila
09319a37de Updating the versions 2018-10-30 14:23:30 +05:30
Ruwan
c3bd6c63d8
Merge pull request #1879 from charithag/master
Update component versions & fixed tests
2018-10-30 14:14:44 +05:30
Geeth
a1cd9cad2c
Merge pull request #1882 from geethkokila/master
Updating the migration script
2018-10-30 14:11:38 +05:30
geethkokila
3ce9da92de Updating the migration script 2018-10-30 14:01:44 +05:30
charitha
4689d98525 Update component versions 2018-10-25 01:04:11 +05:30
charitha
007c2479ba Update component versions & fixed tests 2018-10-24 12:52:07 +05:30
Hasunie
69af18f7e6
Merge pull request #1876 from geethkokila/master
Migration artifacts from IoT 3.1.0 - IoT  3.3.1
2018-10-20 18:34:53 -07:00
geethkokila
725f483e7e Add the migration to product. I am adding the migration related jar file also here. This is due to make this a complete instructive package. IS migration and device database migrations are run in two different ways. 2018-10-20 22:14:22 +05:30
Madawa Soysa
61fb81fd8d Merge branch 'master' into 'master'
Fix device type deploying issue

See merge request entgra/product-iots!4
2018-10-18 00:29:29 +00:00
lasanthaDLPDS
ef7a287ce6 Fix device type deploying issue 2018-10-17 18:26:19 +05:30
Milan Perera
6a2d61014d Add iot.http.port to iot-server.sh 2018-10-11 14:35:06 +05:30
Geeth
1e0b8aa322
Merge pull request #1871 from milanperera/master
Add iot.http.port to iot-server.sh
2018-10-11 14:30:45 +05:30
Milan Perera
f7e8e37ed2 Add iot.http.port to iot-server.sh 2018-10-11 14:13:58 +05:30
charitha
a05a4323e6 Merge remote-tracking branch 'entgra/master' into entgra-master
# Conflicts:
#	modules/distribution/src/core/samples/device-plugins-deployer.xml
2018-10-10 21:34:18 +05:30
charitha
dc9d9799e3 Add android sense to sample device plugins 2018-10-10 21:33:10 +05:30
Charitha Goonetilleke
ade1a5c021 Merge branch 'master' into 'master'
Fix IoT device deploying issue

See merge request entgra/product-iots!2
2018-10-08 18:29:32 +00:00
lasanthaDLPDS
30182eb230 White labeling Readme 2018-10-08 11:49:16 +05:30
charitha
52fb5b2651 Merge remote-tracking branch 'entgra/master' into entgra-master
# Conflicts:
#	pom.xml
2018-10-08 10:54:38 +05:30
charitha
fc21b8a53c Update app manager version 2018-10-08 10:53:29 +05:30
lasanthaDLPDS
ab92a2fda6 Fix script white labeling issue 2018-10-08 10:30:55 +05:30
lasanthaDLPDS
e4c9477bf7 Fix IoT device deploying issue 2018-10-08 10:30:55 +05:30
Milan Harindu
c3ea7e9012 Merge branch 'master' into 'master'
Correcting integration test for device types

See merge request entgra/product-iots!3
2018-10-08 04:48:50 +00:00
Ace
be0dfb9c6f Merge branch 'master' of https://gitlab.com/entgra/product-iots 2018-10-06 15:55:43 +05:30
Ace
00c9334d50 Correcting integration test 2018-10-06 15:55:27 +05:30
Milan Harindu
bb89875316 Update .gitlab-ci.yml 2018-10-05 09:23:59 +00:00
Milan Harindu
cf6ffb82d0 Update .gitlab-ci.yml 2018-10-05 09:06:47 +00:00
Milan Harindu
cb6391d95c Update .gitlab-ci.yml 2018-10-05 08:51:50 +00:00
mharindu
112376eab5 Update pom.xml 2018-10-05 08:49:08 +00:00
Milan Harindu
66130ab4da Update .gitlab-ci.yml 2018-10-05 07:34:40 +00:00
Milan Harindu
d711d94d77 Update .gitlab-ci.yml 2018-10-05 07:13:53 +00:00
Charitha Goonetilleke
67f5ba92f7 Update .gitlab-ci.yml 2018-10-03 05:43:36 +00:00