ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #326 from sinthuja/test-merge

Browse Source 
Updating to carbon-device-plugin v3.0.17,
application-manager-new
Amal Gunatilake 8 years ago committed by GitHub
parent 5a033994b6 1e23e37952
commit 0ca0fd8454
5 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File

13
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1387,9 +1387,9 @@
<!-- Adding IoT Analytics Dashboard and gadget CApps --> <!-- Adding IoT Analytics Dashboard and gadget CApps -->
<file> <file>
<source> <source>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/org_wso2_carbon_device_mgt_cdmf_analytics-1.0.0.car
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/device_management/ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/
</outputDirectory> </outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -1747,15 +1747,6 @@
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<file>
<source>
../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/
</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- ********************************* End of Analytics Profile ********************************* --> <!-- ********************************* End of Analytics Profile ********************************* -->
<!-- ********************************* Start of Broker Profile ********************************* --> <!-- ********************************* Start of Broker Profile ********************************* -->

2
modules/distribution/src/core/plugins/plugins-deployer.xml
Unescape View File

@ -207,6 +207,6 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<carbon.device.mgt.plugin.version>3.0.15</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.17</carbon.device.mgt.plugin.version>
</properties> </properties>
</project> </project>

10
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -116,7 +116,7 @@
<!-- END - Analytics features --> <!-- END - Analytics features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
@ -489,10 +489,6 @@
<id>org.wso2.carbon.dashboard.deployment.feature.group</id> <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
<version>${carbon.dashboard.version}</version> <version>${carbon.dashboard.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.cdmf.feature.group</id>
<version>${cdmf.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.messageconsole.feature.group</id> <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
<version>${carbon.analytics.das.version}</version> <version>${carbon.analytics.das.version}</version>
@ -813,8 +809,8 @@
<!-- IoT Analytics Features --> <!-- IoT Analytics Features -->
<feature> <feature>
<id>org.wso2.carbon.analytics.cdmf.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${cdmf.analytics.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.gadget.template.feature.group</id> <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>

9
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -480,7 +480,7 @@
<!-- End of Dashboards Features --> <!-- End of Dashboards Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.device.statistics.dashboard.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.device.statistics.dashboard.feature:${carbon.device.mgt.plugin.version}
@ -730,9 +730,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -1588,8 +1585,8 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.cdmf.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${cdmf.analytics.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>

5
pom.xml
Unescape View File

@ -1521,7 +1521,7 @@
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.15</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.17</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@ -1659,9 +1659,6 @@
<!--mqtt version--> <!--mqtt version-->
<eclipse.paho.version>1.0.2</eclipse.paho.version> <eclipse.paho.version>1.0.2</eclipse.paho.version>
<!-- CDMF Analytics -->
<cdmf.analytics.version>1.0.4-SNAPSHOT</cdmf.analytics.version>
<apache.httpmime.version>4.2.5</apache.httpmime.version> <apache.httpmime.version>4.2.5</apache.httpmime.version>
<apache.httpclient.version>4.5.2</apache.httpclient.version> <apache.httpclient.version>4.5.2</apache.httpclient.version>
</properties> </properties>

Write Preview
Loading…
Cancel
Save