Merge pull request #1874 from dinusha92/main

Release prep for alpha2.
wso2 · Apr 9, 2021 · 3416ed8 · 3416ed8
2 parents 316a221 + 584d64f
commit 3416ed8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
@@ -47,7 +47,7 @@
                 <exclude>./apim/**</exclude>
                 <exclude>./choreo-connect/config-toml-configmap-for-eventhub.yaml</exclude>
             </excludes>
-            <outputDirectory>choreo-connect-${project.version}/k8s-artifacts/choreo-connect</outputDirectory>
+            <outputDirectory>choreo-connect-${project.version}/k8s-artifacts/</outputDirectory>
         </fileSet>
         <fileSet>
             <outputDirectory>choreo-connect-${project.version}/docker-compose/resources/enforcer/dropins

diff --git a/enforcer/LICENSE.txt b/enforcer/LICENSE.txt
@@ -120,7 +120,7 @@ jopt-simple-5.0.3.jar
 woden-impl-dom-1.0M9.jar                                                                            bundle         apache2             
 netty-tcnative-boringssl-static-2.0.31.Final.jar                                                    bundle         apache2             
 swagger-models-2.0.8.jar                                                                            bundle         apache2             
-org.wso2.choreo.connect.enforcer-0.9.0-alpha.jar                                                    bundle         apache2             
+org.wso2.choreo.connect.enforcer-0.9.0-alpha2.jar                                                   bundle         apache2
 jline-0.9.94.jar                                                                                    jar            bsd                 
 swagger-annotations-2.0.8.jar                                                                       bundle         apache2             
 slf4j-api-1.6.3.jar                                                                                 bundle         mit                 

diff --git a/release-note.html b/release-note.html
@@ -23,16 +23,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/>
-    <title>Choreo Connect v0.9.0-Alpha</title>
+    <title>Choreo Connect v0.9.0-Alpha2</title>
 </head>
 <body>
 <div id="main-content">
     <div>
-        <h1>Choreo Connect v0.9.0-Alpha is Released</h1>
-        <h2>What's new in Choreo Connect 0.9.0-Alpha</h2>
+        <h1>Choreo Connect v0.9.0-Alpha2 is Released</h1>
+        <h2>What's new in Choreo Connect 0.9.0-Alpha2</h2>
         <ul>
             <li>
-                <p>This is the alpha release of the Choreo Connect 0.9.0</p>
+                <p>This is the alpha2 release of the Choreo Connect 0.9.0</p>
             </li>
             <li>
                 <p>Microservices have become the norm for modern application architecture. Workloads of modern
@@ -78,7 +78,7 @@ <h2>Known Issues</h2>
             <a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aopen+is%3Aissue+project%3Awso2%2Fproduct-microgateway%2F8">Open
                 Issues</a></p>
         <h2>Try it</h2>
-        <p><a href="https://github.com/wso2/product-microgateway/tree/v0.9.0-alpha#choreo-connect-quick-start">Quick
+        <p><a href="https://github.com/wso2/product-microgateway/tree/v0.9.0-alpha2#choreo-connect-quick-start">Quick
             start guide</a></p>
         <h2>Contributing</h2>
         <h2>How To Contribute</h2>

diff --git a/remove-containers.sh b/remove-containers.sh
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-micro_gw_version=0.9.0-beta-SNAPSHOT
+micro_gw_version=0.9.0-alpha2
 
 docker kill "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"
 docker rm "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"

diff --git a/resources/docker-compose/apim/docker-compose.yaml b/resources/docker-compose/apim/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
     volumes:
       - ./conf/deployment.toml:/home/wso2carbon/wso2am-4.0.0-beta/repository/conf/deployment.toml
   router:
-    image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"
@@ -42,7 +42,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"
@@ -64,7 +64,7 @@ services:
     links:
       - apim
   enforcer:
-    image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"

diff --git a/resources/docker-compose/docker-compose.yaml b/resources/docker-compose/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"
@@ -30,7 +30,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"
@@ -45,7 +45,7 @@ services:
       - "18000:18000"
       - "9843:9843"
   enforcer:
-    image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:0.9.0-alpha2
     logging:
       options:
         max-size: "20m"

diff --git a/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml b/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml
@@ -48,7 +48,7 @@ spec:
             - mountPath: /home/wso2/conf/log_config.toml
               subPath: log_config.toml
               name: logconfig-toml-vol
-          image: wso2/choreo-connect-adapter:0.9.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-adapter:0.9.0-alpha2
           imagePullPolicy: Always
           env:
             - name: cp_admin_pwd

diff --git a/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml
@@ -52,7 +52,7 @@ spec:
               name: logconfig-toml-vol
             - mountPath: /home/wso2/lib/dropins
               name: dropins-vol
-          image: wso2/choreo-connect-enforcer:0.9.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-enforcer:0.9.0-alpha2
           imagePullPolicy: Always
           env:
             - name: ENFORCER_PRIVATE_KEY_PATH
@@ -112,7 +112,7 @@ spec:
               name: router-keystore-vol
             - mountPath: /home/wso2/security/truststore
               name: router-truststore-vol
-          image: wso2/choreo-connect-router:0.9.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-router:0.9.0-alpha2
           imagePullPolicy: Always
           env:
             - name: ROUTER_ADMIN_HOST