Merge branch 'master' of https://github.com/wso2/product-iot-server into IoTS-1.0.0

# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
#	modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
#	modules/p2-profile-gen/pom.xml
#	pom.xml
application-manager-new
charitha 8 years ago
parent d303243e35
commit 2c17afe789

@ -1007,11 +1007,6 @@
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>${eclipse.paho.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes</artifactId>
<version>${carbon.messaging.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.core.admin.styles</artifactId>
@ -1682,7 +1677,8 @@
<!--http client version-->
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.1</httpcore.version>
<httpcore.version>4.3.0.wso2v1</httpcore.version>
<!--json version-->
<json-simple.version>1.1.wso2v1</json-simple.version>
<json.path.version>0.9.1</json.path.version>

Loading…
Cancel
Save