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 pull request #19 from Gathika94/add-emm-analytics

Browse Source 
fixed some version issues in pom files
This commit is contained in:
Charitha Goonetilleke 2017-10-11 16:58:49 +05:30 committed by GitHub
commit b9d7563c93
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>siddhi-extensions</artifactId>
<version>4.0.86-SNAPSHOT</version>
<version>4.0.88-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,6 +86,26 @@
<artifactId>javax.cache.wso2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>RELEASE</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
<version>4.0.88-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>RELEASE</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>RELEASE</version>
</dependency>
</dependencies>
<build>

3
components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java
View File

@ -31,6 +31,7 @@ import org.wso2.siddhi.core.executor.function.FunctionExecutor;
import org.wso2.siddhi.query.api.definition.Attribute;
import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException;
/**
* isDeviceInGroup(deviceId , groupId)
* Returns true if device belongs to group, otherwise false.
@ -50,7 +51,7 @@ public class IsDeviceInGroupFunctionExecutor extends FunctionExecutor {
"Invalid no of arguments passed to group:isDeviceInGroup() function, required 3, but found "
+ attributeExpressionExecutors.length);
}
if (attributeExpressionExecutors[0].getReturnType() != Attribute.Type.INT) {
if (attributeExpressionExecutors[0].getReturnType()!= Attribute.Type.INT) {
throw new ExecutionPlanValidationException(
"Invalid parameter type found for the first argument (group id) of group:isDeviceInGroup() " +
"function, required " + Attribute.Type.INT + ", but found " +

2
features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>4.0.86-SNAPSHOT</version>
<version>4.0.88-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
pom.xml
View File

@ -1179,7 +1179,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management -->
<carbon.devicemgt.version>3.0.135</carbon.devicemgt.version>
<carbon.devicemgt.version>3.0.136-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
<!-- Carbon App Management -->