Merge branch 'master' of github.com:wso2/product-iots

merge-requests/1/head
Chatura Dilan 8 years ago
commit af68560826

@ -699,6 +699,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<!-- *************** End of DAS Client *************** --> <!-- *************** End of DAS Client *************** -->
<featureArtifactDef> <featureArtifactDef>
@ -1497,6 +1500,10 @@
<id>org.wso2.carbon.analytics.api.client.feature.group</id> <id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.jsservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- *************** END - DAS Client *************** --> <!-- *************** END - DAS Client *************** -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ --> <!-- ************** START - EVENT PROCESSING FEATURES ************ -->

@ -1547,7 +1547,7 @@
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.5</carbon.analytics.common.version> <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
<carbon.analytics.version>1.3.0</carbon.analytics.version> <carbon.analytics.version>1.3.3-SNAPSHOT</carbon.analytics.version>
<carbon.analytics.das.version>1.3.0</carbon.analytics.das.version> <carbon.analytics.das.version>1.3.0</carbon.analytics.das.version>
<product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version> <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
<product.das.version>3.1.0</product.das.version> <product.das.version>3.1.0</product.das.version>

Loading…
Cancel
Save