Merge branch 'wso2-master' into test-merge

merge-requests/1/head
sinthuja 8 years ago
commit 7de7610bd5

@ -1518,7 +1518,7 @@
<!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.32</carbon.device.mgt.version>
<carbon.device.mgt.version>2.0.36</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
@ -1526,7 +1526,7 @@
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.17</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.18</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@ -1624,7 +1624,7 @@
<orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
<orbit.version.json>2.0.0.wso2v1</orbit.version.json>
<carbon.dashboard.version>2.0.6</carbon.dashboard.version>
<carbon.event-processing.version>2.1.4</carbon.event-processing.version>
<carbon.event-processing.version>2.1.9</carbon.event-processing.version>
<imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
<akka.version>2.3.4-spark</akka.version>

Loading…
Cancel
Save