From 9dd521e946fe4922d0d014f674b7717d147a06d9 Mon Sep 17 00:00:00 2001 From: dinusha92 Date: Fri, 9 Apr 2021 14:42:02 +0530 Subject: [PATCH 1/4] Release prep for alpha2. --- remove-containers.sh | 2 +- resources/docker-compose/apim/docker-compose.yaml | 6 +++--- resources/docker-compose/docker-compose.yaml | 6 +++--- .../k8s-artifacts/choreo-connect/adapter-deployment.yaml | 2 +- .../choreo-connect/choreo-connect-deployment.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/remove-containers.sh b/remove-containers.sh index 957fcd3a88..50dea2365c 100644 --- 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 index c72ae56621..133a38821b 100644 --- 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 index dd574bf5a6..338b941745 100644 --- 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 index ababb5ea56..86db44490f 100644 --- 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 index 973f2371cf..77388de9fb 100644 --- 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 From 57a429d0b0bacced4e06911b283f2c29879ef348 Mon Sep 17 00:00:00 2001 From: dinusha92 Date: Fri, 9 Apr 2021 15:07:20 +0530 Subject: [PATCH 2/4] Release prep for release note. --- distribution/src/main/assembly/assembly.xml | 2 +- release-note.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml index 4d8d2b08b2..ff79ef0c61 100644 --- a/distribution/src/main/assembly/assembly.xml +++ b/distribution/src/main/assembly/assembly.xml @@ -47,7 +47,7 @@ ./apim/** ./choreo-connect/config-toml-configmap-for-eventhub.yaml - choreo-connect-${project.version}/k8s-artifacts/choreo-connect + choreo-connect-${project.version}/k8s-artifacts/ choreo-connect-${project.version}/docker-compose/resources/enforcer/dropins diff --git a/release-note.html b/release-note.html index cf26f6a093..90b66f0366 100644 --- a/release-note.html +++ b/release-note.html @@ -23,16 +23,16 @@ - Choreo Connect v0.9.0-Alpha + Choreo Connect v0.9.0-Alpha2
-

Choreo Connect v0.9.0-Alpha is Released

-

What's new in Choreo Connect 0.9.0-Alpha

+

Choreo Connect v0.9.0-Alpha2 is Released

+

What's new in Choreo Connect 0.9.0-Alpha2

  • -

    This is the alpha release of the Choreo Connect 0.9.0

    +

    This is the alpha2 release of the Choreo Connect 0.9.0

  • Microservices have become the norm for modern application architecture. Workloads of modern @@ -78,7 +78,7 @@

    Known Issues

    Open Issues

    Try it

    -

    Quick +

    Quick start guide

    Contributing

    How To Contribute

    From 86d064a0567a7dde32d7a48c5f73a8c156f74b5e Mon Sep 17 00:00:00 2001 From: dinusha92 Date: Fri, 9 Apr 2021 15:10:00 +0530 Subject: [PATCH 3/4] Updated licence.txt for alpha2. --- enforcer/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer/LICENSE.txt b/enforcer/LICENSE.txt index 5e36c28d5f..591bbfbd8b 100644 --- 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 From 584d64f8c97862ccb64dd91f4bf9542123f110ae Mon Sep 17 00:00:00 2001 From: dinusha92 Date: Fri, 9 Apr 2021 15:16:54 +0530 Subject: [PATCH 4/4] Updated licence.txt for alpha2. --- enforcer/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer/LICENSE.txt b/enforcer/LICENSE.txt index 591bbfbd8b..d0147db549 100644 --- 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-alpha2.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