From d711d94d77f16869d816521b73972c2b6d680eaf Mon Sep 17 00:00:00 2001
From: Milan Harindu <milanharindu.ucsc@gmail.com>
Date: Fri, 5 Oct 2018 07:13:53 +0000
Subject: [PATCH 1/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4151d186..b2a9e0db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:latest
+image: maven:3.5-jdk-8
 
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.

From 66130ab4da51a0e0dc1182b46324e2cc1d85d2a3 Mon Sep 17 00:00:00 2001
From: Milan Harindu <milanharindu.ucsc@gmail.com>
Date: Fri, 5 Oct 2018 07:34:40 +0000
Subject: [PATCH 2/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2a9e0db..d21c7c44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3.5-jdk-8
+image: maven:3.3.3
 
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.

From 112376eab59d4f0c0e1726df143a74d4c3f27435 Mon Sep 17 00:00:00 2001
From: mharindu <milan@entgra.io>
Date: Fri, 5 Oct 2018 08:49:08 +0000
Subject: [PATCH 3/7] Update pom.xml

---
 pom.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7df9d3e..b75c608f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1640,7 +1640,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.3.0</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>
-            <url>http://nexus.entgra.io/repository/maven-releases/</url>
+            <id>maven-public</id>
+            <url>http://nexus.entgra.io/repository/maven-public/</url>
         </repository>
     </distributionManagement>
 </project>

From cb6391d95c87b95c6e773b2e35aced9dd7b5e8c4 Mon Sep 17 00:00:00 2001
From: Milan Harindu <milanharindu.ucsc@gmail.com>
Date: Fri, 5 Oct 2018 08:51:50 +0000
Subject: [PATCH 4/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d21c7c44..ee310c75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3.3.3
+image: maven:3.5.2
 
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.

From cf6ffb82d00eef5010d6ffd126bbd92e65ac8d2d Mon Sep 17 00:00:00 2001
From: Milan Harindu <milanharindu.ucsc@gmail.com>
Date: Fri, 5 Oct 2018 09:06:47 +0000
Subject: [PATCH 5/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee310c75..ce8ab82a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3.5.2
+image: jamesdbloom/docker-java8-maven
 
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.

From bb89875316f7532dcde1d291455802557365ffc6 Mon Sep 17 00:00:00 2001
From: Milan Harindu <milanharindu.ucsc@gmail.com>
Date: Fri, 5 Oct 2018 09:23:59 +0000
Subject: [PATCH 6/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce8ab82a..fcf28eb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: jamesdbloom/docker-java8-maven
+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.

From 00c9334d50846bebec75226fca2e2b59c98d840a Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Sat, 6 Oct 2018 15:55:27 +0530
Subject: [PATCH 7/7] Correcting integration test

---
 .../integration/jmeter/DeviceTypeManagementJMeterTestCase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java
index a871e1d2..c342e319 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java
+++ b/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;