Removing DAS components from IoT distribution.

merge-requests/1/head
sinthuja 8 years ago
parent 89b8a45e2e
commit 62bad0fb2a

@ -1144,32 +1144,8 @@
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Analytics datasources -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/analytics-datasources.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cep/storm/storm.yaml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/cep/storm/
</outputDirectory>
<filtered>true</filtered>
</file>
<!--DAS Files--> <!--DAS Files-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-processor.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
</outputDirectory>
<filtered>true</filtered>
</file>
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
@ -1209,59 +1185,7 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- ************* Data bridge related files end ********** --> <!-- ************* Data bridge related files end ********** -->
<!--spark udf conf file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-defaults.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark classpath config file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/external-spark-classpath.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark fair scheduler xml file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/fairscheduler.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark udf conf file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-udf-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--akka conf files-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/com.typesafe.config/reference.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/com.typesafe.config/
</outputDirectory>
<fileMode>644</fileMode>
</file>
<!--Analytics REST APIs WebApp -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<fileMode>644</fileMode>
</file>
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties

@ -185,7 +185,7 @@
</build> </build>
<properties> <properties>
<carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.2.6-SNAPSHOT</carbon.device.mgt.plugin.version>
</properties> </properties>
<pluginRepositories> <pluginRepositories>

@ -212,9 +212,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
</featureArtifactDef-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
@ -549,56 +546,15 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.tracer.feature:${carbon.mediation.version}
</featureArtifactDef-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.statistics.feature:${carbon.mediation.version}
</featureArtifactDef-->
<!--APIM feature--> <!--APIM feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--End of APIM Feature--> <!--End of APIM Feature-->
<!--DAS Feature-->
<!--START - Analytics Features -->
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.rdbms.server.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.spark.commons.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.webservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.version}
</featureArtifactDef>
<!-- END - Analytics features -->
<!-- ************** START - Capp Management ********* --> <!-- ************** START - Capp Management ********* -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@ -606,93 +562,37 @@
<!-- ************** END - Capp Management ********* --> <!-- ************** END - Capp Management ********* -->
<!-- ************** START - Data Bridge ************ --> <!-- ************** START - Data Bridge ************ -->
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datareceiver.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventsink.feature:${carbon.analytics.version} org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventtable.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
<!-- ************** END - Data Bridge ************ --> <!-- ************** END - Data Bridge ************ -->
<!-- ************** START - EVENT PROCESSING FEATURES *********** --> <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.simulator.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.core.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.commons.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.stream.persistence.server.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.template.manager.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!-- *************** END OF EVENT PROCESSING FEATURES ********************** -->
<!-- *************** DAS Client *************** -->
<!--End of DAS Feature-->
<!-- Dashboards Features -->
<feaureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
</feaureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Dashboards Features --> <!-- *************** End of DAS Client *************** -->
<!-- MB Features --> <!-- MB Features -->
<featureArtifactDef> <featureArtifactDef>
@ -1383,153 +1283,33 @@
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<!-- START - Analytics Features --> <!-- ************** START - Data Bridge ************ -->
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.spark.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.api.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.spark.commons.feature.group</id> <id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<!-- END - Analytics features --> <!-- ************** END - Data Bridge ************ -->
<feature>
<id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.webservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.jsservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.restapi.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** START - Data Bridge ************ --> <!-- *************** START - DAS Client *************** -->
<feature> <feature>
<id>org.wso2.carbon.databridge.core.server.feature.group</id> <id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datareceiver.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group
</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.eventsink.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature> <!-- *************** END - DAS Client *************** -->
<id>org.wso2.carbon.analytics.eventtable.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** END - Data Bridge ************ -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ --> <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
<feature>
<id>org.wso2.carbon.event.receiver.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.publisher.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.processor.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.tracer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.flow.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.statistics.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.receiver.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.simulator.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id> <id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.processor.manager.core.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.processor.manager.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.stream.persistence.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.template.manager.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- ************** END - EVENT PROCESSING FEATURES ************ -->
<!-- Dashboard Features --> <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
<feature>
<id>org.wso2.carbon.dashboards.shindig.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboards.portal.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboard.deployment.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- End of Dashboard Features -->
<feature> <feature>
<id>org.wso2.carbon.andes.server.feature.group</id> <id>org.wso2.carbon.andes.server.feature.group</id>
@ -1727,22 +1507,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -1891,10 +1659,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2079,22 +1843,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2311,10 +2063,6 @@
<id>org.wso2.carbon.identity.provider.server.feature.group</id> <id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${identity.inbound.auth.openid.version}</version> <version>${identity.inbound.auth.openid.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2499,22 +2247,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2615,10 +2351,6 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id> <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2796,10 +2528,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3031,20 +2759,16 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.spark.commons.feature.group</id> <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
@ -3052,12 +2776,12 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id> <id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id> <id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
@ -3159,10 +2883,6 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id> <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3264,14 +2984,6 @@
<id>org.wso2.carbon.mediation.configadmin.feature.group</id> <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.mediation.statistics.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature-->
<!--feature>
<id>org.wso2.carbon.mediation.tracer.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.application.mgt.server.feature.group</id> <id>org.wso2.carbon.application.mgt.server.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3336,10 +3048,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3571,20 +3279,16 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.spark.commons.feature.group</id> <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
@ -3592,12 +3296,12 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id> <id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id> <id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>

@ -1110,7 +1110,8 @@
<carbon.mediation.version>4.6.6</carbon.mediation.version> <carbon.mediation.version>4.6.6</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.4</carbon.analytics.common.version> <carbon.analytics.common.version>5.1.5-SNAPSHOT</carbon.analytics.common.version>
<carbon.analytics.version>1.2.9-SNAPSHOT</carbon.analytics.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1125,11 +1126,8 @@
<axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version> <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
<!--DAS--> <!--DAS-->
<carbon.analytics.version>1.2.8</carbon.analytics.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<carbon.dashboard.version>2.0.2</carbon.dashboard.version>
<shindig.version>2.0.2</shindig.version> <shindig.version>2.0.2</shindig.version>
<carbon.event-processing.version>2.1.4</carbon.event-processing.version>
<carbon.data.version>4.3.6</carbon.data.version> <carbon.data.version>4.3.6</carbon.data.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient> <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>

Loading…
Cancel
Save