From d33c33161973d500aed5a86d03717356fb89d5a6 Mon Sep 17 00:00:00 2001
From: amali <maamalilakshika@gmail.com>
Date: Tue, 12 Jan 2021 16:35:22 +0530
Subject: [PATCH 1/2] M3 Release preparation

---
 adapter/pom.xml                  | 2 +-
 distribution/pom.xml             | 2 +-
 enforcer/pom.xml                 | 2 +-
 pom.xml                          | 2 +-
 router/pom.xml                   | 2 +-
 test/mock-backend-server/pom.xml | 4 ++--
 test/pom.xml                     | 2 +-
 test/test-integration/pom.xml    | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/adapter/pom.xml b/adapter/pom.xml
index 001138c346..cd1515186d 100644
--- a/adapter/pom.xml
+++ b/adapter/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am.microgw</groupId>
         <artifactId>micro-gateway-parent</artifactId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1a3d32380c..c38ecd9adf 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am.microgw</groupId>
         <artifactId>micro-gateway-parent</artifactId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/enforcer/pom.xml b/enforcer/pom.xml
index 9f4c4e0528..e44bad9a07 100644
--- a/enforcer/pom.xml
+++ b/enforcer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.wso2.am.microgw</groupId>
         <artifactId>micro-gateway-parent</artifactId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 406af5c6cc..4dabc3f272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.wso2.am.microgw</groupId>
     <artifactId>micro-gateway-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.0-m2-SNAPSHOT</version>
+    <version>4.0.0-m3</version>
     <name>Micro Gateway - Parent</name>
 
     <url>https://wso2.org</url>
diff --git a/router/pom.xml b/router/pom.xml
index b6754c5a24..bca2846d24 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am.microgw</groupId>
         <artifactId>micro-gateway-parent</artifactId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/test/mock-backend-server/pom.xml b/test/mock-backend-server/pom.xml
index 7a6eb6f357..6d3997937d 100644
--- a/test/mock-backend-server/pom.xml
+++ b/test/mock-backend-server/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <artifactId>micro-gateway-tests</artifactId>
         <groupId>org.wso2.am.microgw</groupId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <version>4.0.0-m2-SNAPSHOT</version>
+    <version>4.0.0-m3</version>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.am.microgw</groupId>
     <artifactId>mock-backend-server</artifactId>
diff --git a/test/pom.xml b/test/pom.xml
index 5aec35450b..1e83bd2996 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>micro-gateway-parent</artifactId>
         <groupId>org.wso2.am.microgw</groupId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/test/test-integration/pom.xml b/test/test-integration/pom.xml
index 78089e39e4..30849c0311 100644
--- a/test/test-integration/pom.xml
+++ b/test/test-integration/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am.microgw</groupId>
         <artifactId>micro-gateway-tests</artifactId>
-        <version>4.0.0-m2-SNAPSHOT</version>
+        <version>4.0.0-m3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>org.wso2.am.microgw</groupId>
             <artifactId>mock-backend-server</artifactId>
-            <version>4.0.0-m2-SNAPSHOT</version>
+            <version>4.0.0-m3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 96bfa9fdb133c4be6ea38ef7e436bff80b5b9f13 Mon Sep 17 00:00:00 2001
From: amali <maamalilakshika@gmail.com>
Date: Tue, 12 Jan 2021 16:52:47 +0530
Subject: [PATCH 2/2] M3 Release preparation

---
 developer-guide.md            | 2 +-
 remove-containers.sh          | 2 +-
 resources/docker-compose.yaml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/developer-guide.md b/developer-guide.md
index f88755ea32..2bb4cc70e3 100644
--- a/developer-guide.md
+++ b/developer-guide.md
@@ -20,7 +20,7 @@ maven plugin would fail to create the new docker images)
  java-11 as the source)
  
  - Navigate to distribution/target/.
- Then extract the zip file called wso2am-micro-gw-4.0.0-m2-SNAPSHOT.zip
+ Then extract the zip file called wso2am-micro-gw-4.0.0-m3.zip
  
  - Then execute `docker-compose up` to run the setup. This will start an envoy container,
  filter-core container and piot container. The mounted configurations can be found from
diff --git a/remove-containers.sh b/remove-containers.sh
index 6b9feeba2f..03d231e0db 100755
--- a/remove-containers.sh
+++ b/remove-containers.sh
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-micro_gw_version=4.0.0-m2-SNAPSHOT
+micro_gw_version=4.0.0-m3
 
 docker kill $(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')
 docker rm $(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')
diff --git a/resources/docker-compose.yaml b/resources/docker-compose.yaml
index a87f38580d..bf62e029c1 100644
--- a/resources/docker-compose.yaml
+++ b/resources/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/mg-router:4.0.0-m2-SNAPSHOT
+    image: wso2/mg-router:4.0.0-m3
     volumes:
       - ./resources/router/security:/home/wso2/security
     ports:
@@ -11,7 +11,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/mg-adapter:4.0.0-m2-SNAPSHOT
+    image: wso2/mg-adapter:4.0.0-m3
     volumes:  
       - ./resources/adapter/security:/home/wso2/security
       - ./resources/conf:/home/wso2/conf
@@ -19,7 +19,7 @@ services:
       - "18000:18000" 
       - "9843:9843"
   enforcer:
-    image: wso2/mg-enforcer:4.0.0-m2-SNAPSHOT
+    image: wso2/mg-enforcer:4.0.0-m3
     volumes:  
       - ./resources/enforcer/security:/home/wso2/mg/security
       - ./resources/conf:/home/wso2/conf