Merge remote-tracking branch 'upstream/master'

revert-dabc3590
Megala 8 years ago
commit 81eb6dc0d1

@ -64,10 +64,6 @@
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -178,9 +174,6 @@
<bundleDef> <bundleDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${identity.inbound.auth.oauth.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${identity.inbound.auth.oauth.version}
</bundleDef> </bundleDef>
<bundleDef>
com.jayway.jsonpath:json-path
</bundleDef>
</bundles> </bundles>
<importFeatures> <importFeatures>
<importFeatureDef> <importFeatureDef>

Loading…
Cancel
Save