Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ballerina version in Config and IDP services #2527

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions common-bal-libs/apk-common-lib/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
org = "wso2"
name = "apk_common_lib"
version = "0.0.1-SNAPSHOT"
distribution = "2201.8.5"
distribution = "2201.10.1"

[[platform.java11.dependency]]
groupId = "org.wso2.apk"
Expand Down Expand Up @@ -52,14 +52,14 @@ groupId = "com.fasterxml.jackson.core"
artifactId = "jackson-annotations"
version = "2.14.2"

# transitive dependency of org.wso2.apk:org.wso2.apk.common:0.0.1-SNAPSHOT
[[platform.java11.dependency]]
groupId = "org.json"
artifactId = "json"
version = "20231013"

# transitive dependency of org.wso2.apk:org.wso2.apk.common:0.0.1-SNAPSHOT
[[platform.java11.dependency]]
groupId = "commons-lang"
artifactId = "commons-lang"
version = "2.4"

# transitive dependency of org.wso2.apk:org.wso2.apk.common:0.0.1-SNAPSHOT
[[platform.java11.dependency]]
groupId = "org.json"
artifactId = "json"
version = "20230227"
36 changes: 19 additions & 17 deletions common-bal-libs/apk-common-lib/ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.8.5"
distribution-version = "2201.10.1"

[[package]]
org = "ballerina"
name = "auth"
version = "2.10.0"
version = "2.12.0"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -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"},
Expand All @@ -33,15 +33,15 @@ dependencies = [
[[package]]
org = "ballerina"
name = "constraint"
version = "1.4.0"
version = "1.5.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "crypto"
version = "2.5.0"
version = "2.7.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -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"},
Expand All @@ -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"},
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand All @@ -229,17 +230,18 @@ modules = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.9.0"
version = "2.10.0"
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"},
Expand All @@ -252,7 +254,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.2.2"
version = "1.3.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand All @@ -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"},
Expand Down
4 changes: 3 additions & 1 deletion common-bal-libs/apk-common-lib/ballerina/EncoderUtil.bal
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import apk_common_lib.java.lang as javalang;

import ballerina/jballerina.java;
import ballerina/jballerina.java.arrays as jarrays;
import apk_common_lib.java.lang as javalang;

# Ballerina class mapping for the Java `org.wso2.apk.common.EncoderUtil` class.
@java:Binding {'class: "org.wso2.apk.common.EncoderUtil"}
Expand All @@ -25,6 +26,7 @@ public distinct class EncoderUtil {
public function toString() returns string {
return java:toString(self.jObj) ?: "";
}

# The function that maps to the `equals` method of `org.wso2.apk.common.EncoderUtil`.
#
# + arg0 - The `javalang:Object` value required to map with the Java method parameter.
Expand Down
6 changes: 4 additions & 2 deletions common-bal-libs/apk-common-lib/ballerina/GzipUtil.bal
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import apk_common_lib.java.io as javaio;
import apk_common_lib.java.lang as javalang;

import ballerina/jballerina.java;
import ballerina/jballerina.java.arrays as jarrays;
import apk_common_lib.java.lang as javalang;
import apk_common_lib.java.io as javaio;

# Ballerina class mapping for the Java `org.wso2.apk.common.GzipUtil` class.
@java:Binding {'class: "org.wso2.apk.common.GzipUtil"}
Expand All @@ -26,6 +27,7 @@ public distinct class GzipUtil {
public function toString() returns string {
return java:toString(self.jObj) ?: "";
}

# The function that maps to the `equals` method of `org.wso2.apk.common.GzipUtil`.
#
# + arg0 - The `javalang:Object` value required to map with the Java method parameter.
Expand Down
12 changes: 7 additions & 5 deletions common-bal-libs/apk-common-lib/ballerina/YamlUtil.bal
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ballerina/jballerina.java;
import apk_common_lib.java.lang as javalang;

import ballerina/jballerina.java;

# Ballerina class mapping for the Java `org.wso2.apk.common.YamlUtil` class.
@java:Binding {'class: "org.wso2.apk.common.YamlUtil"}
public distinct class YamlUtil {
Expand All @@ -24,6 +25,7 @@ public distinct class YamlUtil {
public function toString() returns string {
return java:toString(self.jObj) ?: "";
}

# The function that maps to the `equals` method of `org.wso2.apk.common.YamlUtil`.
#
# + arg0 - The `javalang:Object` value required to map with the Java method parameter.
Expand All @@ -36,27 +38,27 @@ public distinct class YamlUtil {
#
# + arg0 - The `string` value required to map with the Java method parameter.
# + return - The `string` or the `javalang:Exception` value returning from the Java mapping.
public isolated function fromJsonStringToYaml(string arg0) returns string?|javalang:Exception {
public isolated function fromJsonStringToYaml(string arg0) returns string|javalang:Exception {
handle|error externalObj = org_wso2_apk_common_YamlUtil_fromJsonStringToYaml(self.jObj, java:fromString(arg0));
if (externalObj is error) {
javalang:Exception e = error javalang:Exception(javalang:EXCEPTION, externalObj, message = externalObj.message());
return e;
} else {
return java:toString(externalObj);
return java:toString(externalObj) ?: "";
}
}

# The function that maps to the `fromYamlStringToJson` method of `org.wso2.apk.common.YamlUtil`.
#
# + arg0 - The `string` value required to map with the Java method parameter.
# + return - The `string` or the `javalang:Exception` value returning from the Java mapping.
public isolated function fromYamlStringToJson(string arg0) returns string?|javalang:Exception {
public isolated function fromYamlStringToJson(string arg0) returns string|javalang:Exception {
handle|error externalObj = org_wso2_apk_common_YamlUtil_fromYamlStringToJson(self.jObj, java:fromString(arg0));
if (externalObj is error) {
javalang:Exception e = error javalang:Exception(javalang:EXCEPTION, externalObj, message = externalObj.message());
return e;
} else {
return java:toString(externalObj);
return java:toString(externalObj) ?: "";
}
}

Expand Down
6 changes: 4 additions & 2 deletions common-bal-libs/apk-common-lib/ballerina/ZIPUtils.bal
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ballerina/jballerina.java;
import apk_common_lib.java.lang as javalang;
import apk_common_lib.java.io as javaio;
import apk_common_lib.java.lang as javalang;

import ballerina/jballerina.java;

# Ballerina class mapping for the Java `org.wso2.apk.common.ZIPUtils` class.
@java:Binding {'class: "org.wso2.apk.common.ZIPUtils"}
Expand All @@ -25,6 +26,7 @@ public distinct class ZIPUtils {
public function toString() returns string {
return java:toString(self.jObj) ?: "";
}

# The function that maps to the `equals` method of `org.wso2.apk.common.ZIPUtils`.
#
# + arg0 - The `javalang:Object` value required to map with the Java method parameter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion common-bal-libs/apk-keymanager-libs/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
org = "wso2"
name = "apk_keymanager_libs"
version = "0.0.1-SNAPSHOT"
distribution = "2201.8.5"
distribution = "2201.10.1"

[[dependency]]
org = "wso2"
Expand Down
Loading
Loading