community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins

Browse Source
This commit is contained in:
inoshperera 2020-06-22 09:23:02 +05:30
commit 4dab381a42
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/test-coverage/pom.xml
View File

@ -80,14 +80,6 @@
${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener ${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener
</pull.notification.listener> </pull.notification.listener>
<siddhi.extensions>${extensions}/siddhi-extensions</siddhi.extensions>
<siddhi.json.extensions>
${basedir}/../${siddhi.extensions}/org.wso2.extension.siddhi.execution.json
</siddhi.json.extensions>
<siddhi.device.extensions>
${basedir}/../${siddhi.extensions}/org.wso2.extension.siddhi.device
</siddhi.device.extensions>
<!-- mobile-plugins component --> <!-- mobile-plugins component -->
<mobile.plugins>mobile-plugins</mobile.plugins> <mobile.plugins>mobile-plugins</mobile.plugins>
<android.plugin>${mobile.plugins}/android-plugin</android.plugin> <android.plugin>${mobile.plugins}/android-plugin</android.plugin>
@ -112,8 +104,6 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
<if> <if>
<and> <and>
<available file="${siddhi.json.extensions}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file="${siddhi.device.extensions}/${target}/${coverge-report}/${individual.test.report.name}" />
<available file="${android.api}/${target}/${coverge-report}/${individual.test.report.name}" /> <available file="${android.api}/${target}/${coverge-report}/${individual.test.report.name}" />
</and> </and>
<then> <then>
@ -123,12 +113,6 @@
<mkdir dir="${basedir}/target/coverage-report" /> <mkdir dir="${basedir}/target/coverage-report" />
<report> <report>
<executiondata> <executiondata>
<fileset dir="${siddhi.device.extensions}/${target}/${coverge-report}">
<include name="${individual.test.report.name}" />
</fileset>
<fileset dir="${siddhi.json.extensions}/${target}/${coverge-report}">
<include name="${individual.test.report.name}" />
</fileset>
<fileset dir="${android.api}/${target}/${coverge-report}"> <fileset dir="${android.api}/${target}/${coverge-report}">
<include name="${individual.test.report.name}" /> <include name="${individual.test.report.name}" />
</fileset> </fileset>
@ -234,24 +218,6 @@
<fileset dir="${pull.notification.listener}/${source}" /> <fileset dir="${pull.notification.listener}/${source}" />
</sourcefiles> </sourcefiles>
</group> </group>
<group name="siddhi-extensions">
<group name="org.wso2.extension.siddhi.execution.json">
<classfiles>
<fileset dir="${siddhi.json.extensions}/${target}/${classes}" />
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${siddhi.json.extensions}/${source}" />
</sourcefiles>
</group>
<group name="org.wso2.extension.siddhi.device">
<classfiles>
<fileset dir="${siddhi.device.extensions}/${target}/${classes}" />
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${siddhi.device.extensions}/${source}" />
</sourcefiles>
</group>
</group>
</group> </group>
<group name="mobile-plugins"> <group name="mobile-plugins">
<group name="android-plugin"> <group name="android-plugin">

2
pom.xml
View File

@ -1154,7 +1154,7 @@
<properties> <properties>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>4.1.9</carbon.devicemgt.version> <carbon.devicemgt.version>4.1.10-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->