Commit Graph

297 Commits

Author SHA1 Message Date
Rasika Perera
bfc3882592 Merge pull request #245 from menakaj/master
Enabling Integration tests in parent pom
2017-01-09 14:45:48 +05:30
Menaka Jayawardena
0382a98d30 Enabling Integration tests in parent pom 2017-01-09 12:59:26 +05:30
Rasika Perera
68568c9ed7 Updated cdmf into [2.0.7-SNAPSHOT] cdmf-plugins into [3.0.6-SNAPSHOT] 2017-01-08 08:18:31 +05:30
Rasika Perera
18d97073d1 Updated cdmf-plugins version into [3.0.5] 2017-01-07 22:06:26 +05:30
Rasika Perera
a6e5ab4531 Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kernel.version] 2017-01-07 08:23:29 +05:30
Milan Perera
10866d2e6c Updated APIM version 2017-01-06 16:50:18 +05:30
Milan Perera
11b0db7bed Fixed version conflics 2017-01-06 13:17:25 +05:30
Milan Perera
4576a700e8 Updated to APIM latest snapshot version 2017-01-05 11:23:07 +05:30
Milan Perera
1f172a65ee Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master 2017-01-05 10:05:33 +05:30
Ace
70c656b5d4 reverting commit related to identity version bump 2017-01-04 18:18:29 +05:30
Ace
eaea7ff37f Merging with master 2017-01-04 18:03:08 +05:30
Ace
04128c7ee3 Making h2 db shareable between das and iot core 2017-01-04 17:51:37 +05:30
Ruwan
172f41d8da Merge pull request #233 from rasika/master
Fixing IoTS version issue
2017-01-03 12:31:41 +05:30
Rasika Perera
6866ee8f24 Fixing IoTS version issue 2017-01-03 12:25:08 +05:30
Ace
b22bfa88e6 Bumping IS versions to latest ones 2017-01-02 16:00:01 +05:30
GPrathap
f4bbb1517a upgraded carbon dashboard server version 2017-01-02 14:36:12 +05:30
Rasika Perera
598a41e964 Merge pull request #230 from rasika/master
Upgrading CDMF and CDMF-plugins
2016-12-25 07:55:20 +05:30
Rasika Perera
36480c3c80 Upgrading CDMF and CDMF-plugins 2016-12-25 07:54:31 +05:30
WSO2 Builder
4cd01294ff [maven-release-plugin] prepare for next development iteration 2016-12-24 20:40:57 +00:00
WSO2 Builder
990d941c75 [maven-release-plugin] prepare release v3.0.0-BETA 2016-12-24 20:34:55 +00:00
Rasika Perera
879a3b1c5b Upgrading CDMF and CDMF-plugins 2016-12-25 01:58:25 +05:30
Ace
f0236559b8 updating appm dependencies to relased version 2016-12-22 23:04:35 +05:30
Ace
36ec90b681 Bumping oauth dependencies 2016-12-22 15:42:17 +05:30
Ace
6fa320f8bb Updating identity/auth-saml dependencies to latest 2016-12-22 11:02:36 +05:30
Rasika Perera
2b35ff2aa8 Merge pull request #226 from charithag/master-remove-carbon-console
Remove carbon console ui from MB
2016-12-20 13:05:00 +05:30
Rasika Perera
60b0ddb3ab Version bump of [carbon-analytics-common] 2016-12-20 09:38:08 +05:30
Ace
d48f4e03ea Adding iot-core specific is bundles to accomodate appm identity version upgrade 2016-12-19 15:26:43 +05:30
Ace
fefd0ab3e2 upgrading to latest version of identity 2016-12-19 11:38:18 +05:30
Madawa Soysa
ac5c4b0d3c Removing UI components from MB
This commit removes the ui components of the message broker module in order to bring the module in to a headless state.
2016-12-15 17:21:21 +05:30
charitha
ec2a28d097 Bump versions to next development iteration 2016-12-09 13:12:41 +05:30
WSO2 Builder
412f912ca3 [maven-release-plugin] prepare for next development iteration 2016-12-09 06:30:04 +00:00
WSO2 Builder
80bfd669d2 [maven-release-plugin] prepare release v1.0.0-ALPHA5 2016-12-09 06:27:54 +00:00
charitha
0e13ffc991 Bump versions to released component versions 2016-12-09 01:32:56 +05:30
dunithd
042da62607 Upgrading analytics carbon.kernel.version to 4.4.10 2016-12-08 17:50:00 +05:30
Harshan Liyanage
694a7087b0 Updated carbon component versions to include security fixes 2016-12-06 10:37:55 +05:30
GPrathap
9ec723966d Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-02 18:59:33 +05:30
GPrathap
48f1414ca5 updated carbon messaging and andes versions 2016-12-02 18:59:06 +05:30
Chatura Dilan
0e184a39b1 bumping up appm version 2016-12-02 16:09:36 +05:30
Chatura Dilan
4854851589 bumping the appm version up 2016-12-02 14:50:01 +05:30
charitha
6fb07cfe40 Bump versions to next development 2016-12-01 20:43:00 +05:30
WSO2 Builder
58a2eafffb [maven-release-plugin] prepare for next development iteration 2016-12-01 14:58:06 +00:00
WSO2 Builder
72e39a9603 [maven-release-plugin] prepare release v1.0.0-ALPHA4 2016-12-01 14:55:56 +00:00
charitha
5398c691a7 Bump versions to released component versions 2016-12-01 20:16:40 +05:30
Megala
090da79419 Removing roles and commented lines 2016-12-01 15:45:58 +05:30
Megala
ccd6184c9a Adding fixes for sso and making sso by default for all the jaggery apps 2016-12-01 14:22:22 +05:30
sinthuja
ccb7d837b8 adding the iot geo fencing dashboard. 2016-11-28 01:35:37 +05:30
charitha
50c456b04f Bump versions to next development 2016-11-25 16:31:25 +05:30
WSO2 Builder
5e2b243ee3 [maven-release-plugin] prepare for next development iteration 2016-11-25 10:41:48 +00:00
WSO2 Builder
9828edda94 [maven-release-plugin] prepare release 1.0.0-ALPHA3 2016-11-25 10:39:21 +00:00
charitha
7908154d40 Bump versions to released component versions 2016-11-25 15:47:29 +05:30
sinthuja
0b86f76362 Adding some fixes for android analytics. 2016-11-21 17:15:38 +05:30
charitha
3639871178 Bump versions to next development 2016-11-16 21:19:22 +05:30
WSO2 Builder
686d3be678 [maven-release-plugin] prepare for next development iteration 2016-11-16 15:34:29 +00:00
WSO2 Builder
80aaefe75f [maven-release-plugin] prepare release v1.0.0-ALPHA2 2016-11-16 15:32:27 +00:00
charitha
196b4889d3 Update cdmf plugin version 2016-11-16 20:53:45 +05:30
charitha
3ff3207ac1 Set broker version to be same as the core version 2016-11-16 20:41:22 +05:30
charitha
b891a817e9 Update cdmf component versions to released version
Merge branch 'master' of https://github.com/wso2/product-iot-server into IoTS-1.0.0

# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
#	modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
#	modules/p2-profile-gen/pom.xml
#	pom.xml
2016-11-16 18:51:14 +05:30
sinthuja
9bb6b466ce updating the analytics version to 1.3.0. 2016-11-16 16:26:20 +05:30
sinthuja
41bc7b038c Removing some unnecessary sources from the broker module. 2016-11-16 15:45:22 +05:30
sinthuja
6d1c377ab2 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-16 14:46:48 +05:30
sinthuja
e6d6c5f178 Removing some unnecessary sources from the analytics module. 2016-11-16 14:45:58 +05:30
charitha
669ab894f9 Update component versions for IoTS-1.0.0 release 2016-11-16 13:33:26 +05:30
sinthuja
7b4dfaf98f Merging the conflicts with IoT-1.0.0 branch. 2016-11-10 22:04:53 +05:30
GPrathap
401ad2846c removing mb mqtt authorization extension. This has been moved to https://github.com/wso2/carbon-device-mgt-plugins/pull/403 2016-11-08 16:19:45 +05:30
Ace
2e15f2767d merging with upstream 2016-11-04 20:09:28 +05:30
Ace
c9c717af1c removing common/base modules & refactoring 2016-11-04 18:57:19 +05:30
GPrathap
ffa6a9cf59 removing mb features and related configurations 2016-11-02 15:43:53 +05:30
sinthuja
52a584caa2 changing carbon analytics common version to 5.1.4. 2016-11-02 13:10:57 +05:30
sinthuja
7424caa74f Merge branch 'removeMBReferences' of https://github.com/hastef88/product-iots into IoTS-1.0.0-fresh 2016-11-02 12:56:27 +05:30
sinthuja
6454c5b0df Removing DAS 2016-11-02 11:09:14 +05:30
kamidu
89b8a45e2e adding new released version of carbon-kernal, device-mgt and device-mgt-plugins 2016-11-01 14:43:18 +05:30
Hasitha Amal De Silva
1fe9a80102 removing MB references from IOTserver pack 2016-11-01 00:31:16 -04:00
Kamidu Sachith Punchihewa
d8497e4c56 Update pom.xml with the new released versions 2016-10-21 21:05:10 +05:30
Ace
7df2481077 Fixing build break - adding correct versions 2016-10-21 14:00:58 +05:30
sinthuja
7ca6d065f3 Fixing the builde failure due to carbon-device-mgt version update. 2016-10-19 12:06:12 +05:30
Kamidu Sachith Punchihewa
c9ec57476a Update pom.xml with new snapshot versions 2016-10-18 11:54:08 +05:30
Maninda
d23c141a65 Updated carbon-analytics-common version to 5.1.4 to add the metrics-json embedded dependancy to fix a CNF issue. 2016-10-14 17:16:19 +05:30
ayyoob
0365de839f upgraded version after release 2016-09-29 22:25:38 +05:30
warunalakshitha
e76129ede3 Upgrade iot product to carbon 4.4.9 and latest component versions 2016-09-29 01:12:15 +05:30
Ace
4829277e97 Chainging iots to use earlier version of components and plugins on top of kernel 4.4.3 2016-09-25 07:15:56 +05:30
Chatura Dilan
9bab25e2df bumping up versions 2016-09-20 18:15:26 +05:30
Rasika Perera
96046a19fa Resolve merge conflicts 2016-09-11 08:58:22 +05:30
Rasika Perera
aa7753872d Updating CDMF-plugins version 2016-09-11 08:55:20 +05:30
Rasika Perera
eebb83566d Updating CDMF version 2016-09-11 07:20:02 +05:30
Chatura Dilan
6780433831 changes to dependancies 2016-09-09 23:36:44 +05:30
Rasika Perera
a33aaba394 APIM version bump from v5.0.4 to v5.0.5 2016-08-27 11:49:09 +05:30
Ace
94bd1cb197 updating analytics version to released version 2016-08-25 11:00:26 +05:30
Ace
5551163fdc changing iot plugins version 2016-08-25 09:32:46 +05:30
Ace
d8c0d3aeeb Updating carbon-devicemgt to latest versions with active development 2016-08-24 12:44:34 +05:30
Ruwan
04d5c2aa6f updated device-mgt-plugins version 2016-07-18 14:46:15 +05:30
Ace
288a523c23 Updating IoTS device.mgt versions 2016-07-13 14:42:59 +05:30
ayyoob
1dd689e8d4 Added device scope based authorisation for mqtt 2016-06-20 02:35:26 +05:30
GPrathap
3f3c70c779 upgraded carbon dashboard version 2016-06-02 10:35:54 +05:30
GPrathap
3e1c030d87 upgrade carbon.dashboard.version 2016-06-01 12:16:12 +05:30
ayyoob
9289e9840b removed UI Publisher 2016-05-24 19:27:16 +05:30
ayyoob
f1f2605c6e upgraded the version on CDMF plugins 2016-05-23 13:26:59 +05:30
mharindu
350beff9a0 [maven-release-plugin] prepare for next development iteration 2016-05-20 22:56:51 +05:30
mharindu
45a1e52aea [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 22:56:41 +05:30
mharindu
c8cd3be0fd [maven-release-plugin] rollback the release of v1.0.0-alpha 2016-05-20 22:44:38 +05:30
mharindu
7e998d13ca [maven-release-plugin] prepare for next development iteration 2016-05-20 22:34:57 +05:30
mharindu
ec1170afc6 [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 22:34:47 +05:30
mharindu
a3cd9feeb0 Renamed scm 2016-05-20 22:26:59 +05:30
mharindu
6c13f3b51f [maven-release-plugin] rollback the release of v1.0.0-alpha 2016-05-20 22:00:44 +05:30
mharindu
aea3f2594a [maven-release-plugin] prepare for next development iteration 2016-05-20 21:10:34 +05:30
mharindu
181ac25ba8 [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 21:09:36 +05:30
mharindu
073b9da935 Upgraded versions 2016-05-20 18:07:59 +05:30
GPrathap
503a5ad2fd fix for the jira: IOTS-165 2016-05-19 19:06:41 +05:30
mharindu
a88a20715d Migrated to APIM 5.0.4 2016-05-18 11:50:36 +05:30
ayyoob
44662c625b create mb extension for authorisation 2016-05-09 01:05:55 +05:30
ayyoob
02851637b3 removed das input adapters 2016-05-08 02:50:40 +05:30
ayyoob
394f57d729 Added DAS Extensions features 2016-04-18 17:17:14 +05:30
ayyoob
f91b566425 version update and added das extension feature 2016-04-14 19:57:13 +05:30
ayyoob
7e51653b36 removed snapshot version from dependencies 2016-04-01 21:03:48 +05:30
charithag
85a00afe85 Merge branch 'master' of https://github.com/wso2/product-iot-server
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/features/org.wso2.iot.styles.feature/pom.xml
#	modules/features/pom.xml
#	modules/p2-profile-gen/pom.xml
2016-03-31 23:41:07 +05:30
ayyoob
5b81f8a6a3 upgraded analytics version to snapshot to resolve spark errors 2016-03-31 15:13:47 +05:30
ayyoob
0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature. 2016-03-31 05:58:09 +05:30
charithag
4cfa5f60ea Disabled IoT device types based features temporally. 2016-03-30 02:07:35 +05:30
Ruwan
155867b334 Merge pull request #109 from ayyoob/master
Added JWT grant type and upgraded the APIM version
2016-03-24 08:45:03 +05:30
ayyoob
69740cc2f2 updated APIM version 2016-03-23 03:23:13 +05:30
GPrathap
948c059c4e upgrading the dashboard portal application from 1.0.9 to 1.0.14-SNAPSHOT 2016-03-20 23:48:17 +05:30
Menaka Madushanka
b930301819 Merge remote-tracking branch 'origin/master' 2016-03-10 15:06:04 +05:30
ayyoob
66971e4860 removed conflicting jars that exports same packages 2016-03-08 15:52:09 +05:30
charithag
f087baaa49 Bump event processing version to comply with analytics 2016-03-03 16:03:58 +05:30
Menaka Madushanka
28879b416f Sample installation and verification 2016-02-29 18:31:28 +05:30
Menaka Madushanka
fcd5669361 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-25 11:21:38 +05:30
Ace
be7812722e Upgrading commons version 2016-02-25 10:30:13 +05:30
Ace
7b51e4f36b bumping dependencies to latest versions 2016-02-24 16:33:56 +05:30
Menaka Madushanka
67cb3df652 Code formatting 2016-02-23 18:44:11 +05:30
Menaka Madushanka
cb1c30ec43 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-14 01:48:17 +05:30
charithag
fc702b96b9 Bump carbon device mgt plugins version 2016-02-11 15:33:10 +05:30
Menaka Madushanka
9f9294e571 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-10 12:50:26 +05:30
Menaka Madushanka
f91f4a3555 Integration tests for IOT server 2016-02-10 12:40:18 +05:30
Ace
a62f8025a2 updating mb feature version 2016-02-10 11:54:03 +05:30
Ace
b91f27571f Updating to latest AM version 2016-02-05 12:23:14 +05:30
Ace
4e4bc61dfd upgrading event processing & messaging components to released versions 2016-02-03 09:41:39 +05:30
charithag
a72cee943e Bump analytic version to latest 2016-02-02 14:06:35 +05:30
charithag
74c04dc49b Merged with CDM master 2016-01-28 17:44:10 +05:30
Ace
94f1b87ce3 Removing patches and upgrading DAS and MB 2016-01-25 10:47:31 +05:30
charithag
542f19bf41 Disable integration tests 2016-01-08 11:19:20 +05:30
Ace
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +05:30
Shabir Mohamed
b0f70a9b1b Revert "Added mb feature" 2015-12-22 16:29:25 +05:30
sdkottegoda
1ee42cc94e Added mb feature 2015-12-22 14:27:13 +05:30
charithag
e7fff83780 Add apimgt staging repo 2015-12-15 20:37:14 +05:30
Ace
7be2e2a948 upgrading apim version to 4.3.1 2015-12-15 19:04:11 +05:30
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +05:30
Ace
8cc653a788 bumping identity to 5.0.3 and other fixes 2015-12-10 14:31:01 +05:30
Shabirmean
9ae9bcfb31 Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature 2015-12-08 15:02:43 +05:30
Shabirmean
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +05:30
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +05:30
ayyoob
098547efaa removing unnecessary es store files 2015-11-30 00:28:47 +05:30