From 0d77a4ba965092ab367273aff38a5de8a36d3c24 Mon Sep 17 00:00:00 2001 From: CrowleyRajapakse Date: Wed, 16 Oct 2024 13:23:45 +0530 Subject: [PATCH] upgrade ballerin version and related implementation --- .../apk-common-lib/ballerina/Ballerina.toml | 2 +- .../ballerina/Dependencies.toml | 36 ++++++++------- .../apk-keymanager-libs/Ballerina.toml | 2 +- .../apk-keymanager-libs/Dependencies.toml | 37 +++++++++------- .../notification-grpc-client/Ballerina.toml | 2 +- .../Dependencies.toml | 26 ++++++----- .../ballerina/Ballerina.toml | 2 +- .../ballerina/Ballerina.toml.template | 2 +- .../ballerina/Dependencies.toml | 44 ++++++++++--------- .../ballerina/Dependencies.toml.template | 44 ++++++++++--------- .../ballerina/Ballerina.toml | 2 +- .../ballerina/Ballerina.toml.template | 2 +- .../ballerina/Dependencies.toml | 35 ++++++++------- .../ballerina/Dependencies.toml.template | 35 ++++++++------- .../ballerina/DeployerClient.bal | 5 +-- .../ballerina/modules/java.lang/Object.bal | 1 + .../org.wso2.apk.config.api/APIDefinition.bal | 30 ++++--------- .../org.wso2.apk.config/APKConfValidator.bal | 4 +- .../RuntimeAPICommonUtil.bal | 3 +- 19 files changed, 160 insertions(+), 154 deletions(-) diff --git a/common-bal-libs/apk-common-lib/ballerina/Ballerina.toml b/common-bal-libs/apk-common-lib/ballerina/Ballerina.toml index 0c0685f7b8..0e07d08799 100644 --- a/common-bal-libs/apk-common-lib/ballerina/Ballerina.toml +++ b/common-bal-libs/apk-common-lib/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "apk_common_lib" version = "0.0.1-SNAPSHOT" -distribution = "2201.8.5" +distribution = "2201.10.2" [[platform.java11.dependency]] groupId = "org.wso2.apk" diff --git a/common-bal-libs/apk-common-lib/ballerina/Dependencies.toml b/common-bal-libs/apk-common-lib/ballerina/Dependencies.toml index 7c23044343..2fc2615c80 100644 --- a/common-bal-libs/apk-common-lib/ballerina/Dependencies.toml +++ b/common-bal-libs/apk-common-lib/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.4.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.5.0" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +61,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.7" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +93,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -121,10 +121,11 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -215,7 +216,7 @@ modules = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -229,17 +230,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -252,7 +254,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -284,7 +286,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.11.1" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -323,7 +325,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -337,7 +339,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/common-bal-libs/apk-keymanager-libs/Ballerina.toml b/common-bal-libs/apk-keymanager-libs/Ballerina.toml index 942af34202..fed243bca4 100644 --- a/common-bal-libs/apk-keymanager-libs/Ballerina.toml +++ b/common-bal-libs/apk-keymanager-libs/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "apk_keymanager_libs" version = "0.0.1-SNAPSHOT" -distribution = "2201.8.5" +distribution = "2201.10.2" [[dependency]] org = "wso2" diff --git a/common-bal-libs/apk-keymanager-libs/Dependencies.toml b/common-bal-libs/apk-keymanager-libs/Dependencies.toml index 0e387b3c38..ea3d5b2c46 100644 --- a/common-bal-libs/apk-keymanager-libs/Dependencies.toml +++ b/common-bal-libs/apk-keymanager-libs/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.4.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.5.0" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -64,7 +64,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.8" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -92,7 +92,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -117,10 +117,11 @@ dependencies = [ [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -214,7 +215,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -228,17 +229,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -251,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "sql" -version = "1.11.1" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -301,6 +303,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -326,7 +329,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -337,7 +340,7 @@ dependencies = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/common-bal-libs/notification-grpc-client/Ballerina.toml b/common-bal-libs/notification-grpc-client/Ballerina.toml index b1236f2d46..a2855a9349 100644 --- a/common-bal-libs/notification-grpc-client/Ballerina.toml +++ b/common-bal-libs/notification-grpc-client/Ballerina.toml @@ -2,4 +2,4 @@ org = "wso2" name = "notification_grpc_client" version = "0.0.1-SNAPSHOT" -distribution = "2201.8.5" +distribution = "2201.10.2" diff --git a/common-bal-libs/notification-grpc-client/Dependencies.toml b/common-bal-libs/notification-grpc-client/Dependencies.toml index e4c702d5ac..b4b9814234 100644 --- a/common-bal-libs/notification-grpc-client/Dependencies.toml +++ b/common-bal-libs/notification-grpc-client/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.0" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.4.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.5.0" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.10.0" +version = "1.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, @@ -74,7 +74,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -91,10 +91,11 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -180,7 +181,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -194,7 +195,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -207,7 +208,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.0" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -215,7 +216,7 @@ dependencies = [ [[package]] org = "ballerina" name = "protobuf" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -246,6 +247,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ diff --git a/idp/idp-domain-service/ballerina/Ballerina.toml b/idp/idp-domain-service/ballerina/Ballerina.toml index c3d00b6a8b..7dd23980f3 100644 --- a/idp/idp-domain-service/ballerina/Ballerina.toml +++ b/idp/idp-domain-service/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "idp_domain_service" version = "1.2.0-SNAPSHOT" -distribution = "2201.8.0" +distribution = "2201.10.2" [[platform.java11.dependency]] groupId = "org.postgresql" diff --git a/idp/idp-domain-service/ballerina/Ballerina.toml.template b/idp/idp-domain-service/ballerina/Ballerina.toml.template index cd8488dbf9..dcf66f7a3b 100644 --- a/idp/idp-domain-service/ballerina/Ballerina.toml.template +++ b/idp/idp-domain-service/ballerina/Ballerina.toml.template @@ -2,7 +2,7 @@ org = "wso2" name = "idp_domain_service" version = "PROJECT_VERSION" -distribution = "2201.8.0" +distribution = "2201.10.2" [[platform.java11.dependency]] groupId = "org.postgresql" diff --git a/idp/idp-domain-service/ballerina/Dependencies.toml b/idp/idp-domain-service/ballerina/Dependencies.toml index d8b337703d..bd06575c70 100644 --- a/idp/idp-domain-service/ballerina/Dependencies.toml +++ b/idp/idp-domain-service/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.2" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +61,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.7" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +93,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -110,10 +110,11 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -213,7 +214,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -227,17 +228,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -250,7 +252,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -267,7 +269,7 @@ dependencies = [ [[package]] org = "ballerina" name = "regex" -version = "1.4.3" +version = "1.3.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.string"} @@ -279,7 +281,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.12.0" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,6 +308,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -315,7 +318,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -337,7 +340,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -363,7 +366,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, @@ -378,13 +381,12 @@ modules = [ [[package]] org = "ballerinax" name = "prometheus" -version = "0.2.0" +version = "0.3.1" dependencies = [ {org = "ballerina", name = "http"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "observe"}, - {org = "ballerina", name = "regex"} + {org = "ballerina", name = "observe"} ] modules = [ {org = "ballerinax", packageName = "prometheus", moduleName = "prometheus"} diff --git a/idp/idp-domain-service/ballerina/Dependencies.toml.template b/idp/idp-domain-service/ballerina/Dependencies.toml.template index 13fa689897..3ea25d258a 100644 --- a/idp/idp-domain-service/ballerina/Dependencies.toml.template +++ b/idp/idp-domain-service/ballerina/Dependencies.toml.template @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.2" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +61,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.7" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +93,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -110,10 +110,11 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -213,7 +214,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -227,17 +228,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -250,7 +252,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -267,7 +269,7 @@ dependencies = [ [[package]] org = "ballerina" name = "regex" -version = "1.4.3" +version = "1.3.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.string"} @@ -279,7 +281,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.12.0" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,6 +308,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -315,7 +318,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -337,7 +340,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -363,7 +366,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, @@ -378,13 +381,12 @@ modules = [ [[package]] org = "ballerinax" name = "prometheus" -version = "0.2.0" +version = "0.3.1" dependencies = [ {org = "ballerina", name = "http"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "observe"}, - {org = "ballerina", name = "regex"} + {org = "ballerina", name = "observe"} ] modules = [ {org = "ballerinax", packageName = "prometheus", moduleName = "prometheus"} diff --git a/runtime/config-deployer-service/ballerina/Ballerina.toml b/runtime/config-deployer-service/ballerina/Ballerina.toml index a5b131ee57..e62934d3cb 100644 --- a/runtime/config-deployer-service/ballerina/Ballerina.toml +++ b/runtime/config-deployer-service/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "config_deployer_service" version = "1.2.0-SNAPSHOT" -distribution = "2201.8.5" +distribution = "2201.10.2" [build-options] observabilityIncluded = true diff --git a/runtime/config-deployer-service/ballerina/Ballerina.toml.template b/runtime/config-deployer-service/ballerina/Ballerina.toml.template index c09518f165..ee0174f0c4 100644 --- a/runtime/config-deployer-service/ballerina/Ballerina.toml.template +++ b/runtime/config-deployer-service/ballerina/Ballerina.toml.template @@ -2,7 +2,7 @@ org = "wso2" name = "config_deployer_service" version = "PROJECT_VERSION" -distribution = "2201.8.5" +distribution = "2201.10.2" [build-options] observabilityIncluded = true diff --git a/runtime/config-deployer-service/ballerina/Dependencies.toml b/runtime/config-deployer-service/ballerina/Dependencies.toml index ea56ecf6a9..6776704f0f 100644 --- a/runtime/config-deployer-service/ballerina/Dependencies.toml +++ b/runtime/config-deployer-service/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -44,7 +44,7 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.3" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -56,7 +56,7 @@ modules = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -70,7 +70,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.16" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -133,10 +133,11 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -233,7 +234,7 @@ modules = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -247,11 +248,12 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] modules = [ {org = "ballerina", packageName = "mime", moduleName = "mime"} @@ -260,7 +262,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -273,7 +275,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -302,7 +304,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.11.2" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -326,6 +328,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -335,7 +338,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.1" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -354,7 +357,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -380,7 +383,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/runtime/config-deployer-service/ballerina/Dependencies.toml.template b/runtime/config-deployer-service/ballerina/Dependencies.toml.template index 9050b63196..4f8186cf01 100644 --- a/runtime/config-deployer-service/ballerina/Dependencies.toml.template +++ b/runtime/config-deployer-service/ballerina/Dependencies.toml.template @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.2" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -44,7 +44,7 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.3" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -56,7 +56,7 @@ modules = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -70,7 +70,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.16" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -133,10 +133,11 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -233,7 +234,7 @@ modules = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -247,11 +248,12 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] modules = [ {org = "ballerina", packageName = "mime", moduleName = "mime"} @@ -260,7 +262,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -273,7 +275,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -302,7 +304,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.11.2" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -326,6 +328,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -335,7 +338,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.1" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -354,7 +357,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -380,7 +383,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/runtime/config-deployer-service/ballerina/DeployerClient.bal b/runtime/config-deployer-service/ballerina/DeployerClient.bal index 27fb38cd23..6bb85ecc1d 100644 --- a/runtime/config-deployer-service/ballerina/DeployerClient.bal +++ b/runtime/config-deployer-service/ballerina/DeployerClient.bal @@ -145,11 +145,8 @@ public class DeployerClient { return e909028(); } } on fail var e { - if e is commons:APKError { - return e; - } log:printError("Internal Error occured while deploying API", e); - return e909028(); + return e; } } diff --git a/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal b/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal index fecc99e43f..c3040ebc0b 100644 --- a/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal +++ b/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal @@ -22,6 +22,7 @@ public distinct class Object { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `java.lang.Object`. # # + arg0 - The `Object` value required to map with the Java method parameter. diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal index d83c9224c6..d8565f0c9c 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal @@ -1,9 +1,10 @@ -import ballerina/jballerina.java; -import ballerina/jballerina.java.arrays as jarrays; import config_deployer_service.java.lang as javalang; import config_deployer_service.java.util as javautil; import config_deployer_service.org.wso2.apk.config.model as orgwso2apkconfigmodel; +import ballerina/jballerina.java; +import ballerina/jballerina.java.arrays as jarrays; + # Ballerina class mapping for the Java `org.wso2.apk.config.api.APIDefinition` class. @java:Binding {'class: "org.wso2.apk.config.api.APIDefinition"} public distinct class APIDefinition { @@ -27,6 +28,7 @@ public distinct class APIDefinition { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `canHandleDefinition` method of `org.wso2.apk.config.api.APIDefinition`. # # + arg0 - The `string` value required to map with the Java method parameter. @@ -53,7 +55,7 @@ public distinct class APIDefinition { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -62,13 +64,13 @@ public distinct class APIDefinition { # + arg0 - The `orgwso2apkconfigmodel:API` value required to map with the Java method parameter. # + arg1 - The `string` value required to map with the Java method parameter. # + return - The `string` or the `APIManagementException` value returning from the Java mapping. - public function generateAPIDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns APIManagementException|string? { + public function generateAPIDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns string|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_generateAPIDefinition2(self.jObj, arg0.jObj, java:fromString(arg1)); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -176,13 +178,13 @@ public distinct class APIDefinition { # # + arg0 - The `string` value required to map with the Java method parameter. # + return - The `string` or the `APIManagementException` value returning from the Java mapping. - public function processOtherSchemeScopes(string arg0) returns APIManagementException|string? { + public function processOtherSchemeScopes(string arg0) returns string|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_processOtherSchemeScopes(self.jObj, java:fromString(arg0)); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -240,15 +242,6 @@ public distinct class APIDefinition { } -# The constructor function to generate an object of `org.wso2.apk.config.api.APIDefinition`. -# -# + return - The new `APIDefinition` class generated. -public function newAPIDefinition1() returns APIDefinition { - handle externalObj = org_wso2_apk_config_api_APIDefinition_newAPIDefinition1(); - APIDefinition newObj = new (externalObj); - return newObj; -} - function org_wso2_apk_config_api_APIDefinition_canHandleDefinition(handle receiver, handle arg0) returns boolean = @java:Method { name: "canHandleDefinition", 'class: "org.wso2.apk.config.api.APIDefinition", @@ -363,8 +356,3 @@ function org_wso2_apk_config_api_APIDefinition_wait3(handle receiver, int arg0, paramTypes: ["long", "int"] } external; -function org_wso2_apk_config_api_APIDefinition_newAPIDefinition1() returns handle = @java:Constructor { - 'class: "org.wso2.apk.config.api.APIDefinition", - paramTypes: [] -} external; - diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal index c9ee075c73..b64953786a 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal @@ -1,7 +1,8 @@ -import ballerina/jballerina.java; import config_deployer_service.java.lang as javalang; import config_deployer_service.org.wso2.apk.config.api as orgwso2apkconfigapi; +import ballerina/jballerina.java; + # Ballerina class mapping for the Java `org.wso2.apk.config.APKConfValidator` class. @java:Binding {'class: "org.wso2.apk.config.APKConfValidator"} public isolated distinct class APKConfValidator { @@ -25,6 +26,7 @@ public isolated distinct class APKConfValidator { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `org.wso2.apk.config.APKConfValidator`. # # + arg0 - The `javalang:Object` value required to map with the Java method parameter. diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal index 5de894a46e..1a38d2366e 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal @@ -29,6 +29,7 @@ public distinct class RuntimeAPICommonUtil { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `org.wso2.apk.config.RuntimeAPICommonUtil`. # # + arg0 - The `javalang:Object` value required to map with the Java method parameter. @@ -126,7 +127,7 @@ public isolated function RuntimeAPICommonUtil_generateDefinition2(orgwso2apkconf orgwso2apkconfigapi:APIManagementException e = error orgwso2apkconfigapi:APIManagementException(orgwso2apkconfigapi:APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } }