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

components/test-coverage/pom.xml

@@ -80,14 +80,6 @@
             ${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.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>mobile-plugins</mobile.plugins>
         <android.plugin>${mobile.plugins}/android-plugin</android.plugin>
@@ -112,8 +104,6 @@
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
                                 <if>
                                     <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}" />
                                     </and>
                                     <then>
@@ -123,12 +113,6 @@
                                         <mkdir dir="${basedir}/target/coverage-report" />
                                         <report>
                                             <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}">
                                                     <include name="${individual.test.report.name}" />
                                                 </fileset>
@@ -234,24 +218,6 @@
                                                             <fileset dir="${pull.notification.listener}/${source}" />
                                                         </sourcefiles>
                                                     </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 name="mobile-plugins">
                                                     <group name="android-plugin">

pom.xml

@@ -1154,7 +1154,7 @@
     <properties>
 
         <!-- 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 Device Management Plugins -->