Merge remote-tracking branch 'entgra/master' into entgra-master

# Conflicts:
#	pom.xml

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: maven:latest
+image: shinyay/docker-mvn-jdk8:3.5.0
 
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java

@@ -89,7 +89,7 @@ public class DeviceTypeManagementJMeterTestCase extends TestBase {
         // Allow some time for message delivery
         Thread.sleep(10000);
         ArrayList<MqttMessage> mqttMessages = mqttDeviceSubscriberClient.getMqttMessages();
-        Assert.assertEquals("listener did not recieve mqtt messages ", 0, mqttMessages.size());
+        Assert.assertEquals("listener did not recieve mqtt messages ", 1, mqttMessages.size());
 
         String topicPub = automationContext.getContextTenant().getDomain() + "/"+deviceType+"/"+deviceId+"/events";
         int qos = 2;

pom.xml

@@ -1640,7 +1640,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.5.0-SNAPSHOT</appmgt.feature.version>
+        <appmgt.feature.version>1.5.0</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.5.1</carbon.store.version>
@@ -1903,13 +1903,9 @@
         </repository>
     </repositories>
     <distributionManagement>
-        <snapshotRepository>
-            <id>maven-snapshots</id>
-            <url>http://nexus.entgra.io/repository/maven-snapshots/</url>
-    	</snapshotRepository>
     	<repository>
-            <id>maven-release</id>
+            <id>maven-public</id>
-            <url>http://nexus.entgra.io/repository/maven-releases/</url>
+            <url>http://nexus.entgra.io/repository/maven-public/</url>
         </repository>
     </distributionManagement>
 </project>