From ffb6d196f093753a7712d84961301f0ebd59b1cd Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Sat, 19 Apr 2025 00:39:34 +0530 Subject: [PATCH 1/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 26 +++++++++++++------------- ballerina/CompilerPlugin.toml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 63a53c1..9c0636e 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -4,76 +4,76 @@ name = "wso2.apim.catalog" version = "1.0.0" distribution = "2201.10.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina" artifactId = "wso2.apim.catalog-native" version = "1.0.0" path = "../native/build/libs/wso2.apim.catalog-native-1.0.0-SNAPSHOT.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-core" version = "2.15.2" path = "lib/jackson-core-2.15.2.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-databind" version = "2.15.2" path = "lib/jackson-databind-2.15.2.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-annotations" version = "2.15.2" path = "lib/jackson-annotations-2.15.2.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.datatype" artifactId = "jackson-datatype-jsr310" version = "2.15.2" path = "lib/jackson-datatype-jsr310-2.15.2.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.dataformat" artifactId = "jackson-dataformat-yaml" version = "2.15.2" path = "lib/jackson-dataformat-yaml-2.15.2.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.core.v3" artifactId = "swagger-core-jakarta" version = "2.2.10" path = "lib/swagger-core-jakarta-2.2.10.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.core.v3" artifactId = "swagger-models" version = "2.2.10" path = "lib/swagger-models-2.2.10.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser-v3" version = "2.2.10" path = "lib/swagger-parser-v3-2.1.16.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser" version = "2.2.10" path = "lib/swagger-parser-2.1.16.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser-core" version = "2.2.10" path = "lib/swagger-parser-core-2.1.16.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "org.yaml" artifactId = "snakeyaml" version = "2.0" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 6a98476..3c710e8 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -8,5 +8,5 @@ path = "../compiler-plugin/build/libs/wso2.apim.catalog-compiler-plugin-1.0.0-SN [[dependency]] path = "lib/ballerina-to-openapi-2.0.3.jar" -[platform.java17] +[platform.java21] graalvmCompatible = true From bff854304895a903f1ec7c5a8def07a09c61b4e2 Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Sat, 19 Apr 2025 00:48:44 +0530 Subject: [PATCH 2/4] [Automated] Update the native jar versions --- ballerina/Dependencies.toml | 307 ------------------------------------ 1 file changed, 307 deletions(-) delete mode 100644 ballerina/Dependencies.toml diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml deleted file mode 100644 index 534382a..0000000 --- a/ballerina/Dependencies.toml +++ /dev/null @@ -1,307 +0,0 @@ -# AUTO-GENERATED FILE. DO NOT MODIFY. - -# This file is auto-generated by Ballerina for managing dependency versions. -# It should not be modified by hand. - -[ballerina] -dependencies-toml-version = "2" -distribution-version = "2201.10.0" - -[[package]] -org = "ballerina" -name = "auth" -version = "2.12.0" -dependencies = [ - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.array"}, - {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"} -] - -[[package]] -org = "ballerina" -name = "cache" -version = "3.8.0" -dependencies = [ - {org = "ballerina", name = "constraint"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "task"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "constraint" -version = "1.5.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] -modules = [ - {org = "ballerina", packageName = "constraint", moduleName = "constraint"} -] - -[[package]] -org = "ballerina" -name = "crypto" -version = "2.7.2" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "file" -version = "1.10.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "os"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "http" -version = "2.12.1" -dependencies = [ - {org = "ballerina", name = "auth"}, - {org = "ballerina", name = "cache"}, - {org = "ballerina", name = "constraint"}, - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "file"}, - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "jwt"}, - {org = "ballerina", name = "lang.array"}, - {org = "ballerina", name = "lang.decimal"}, - {org = "ballerina", name = "lang.int"}, - {org = "ballerina", name = "lang.regexp"}, - {org = "ballerina", name = "lang.runtime"}, - {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "lang.value"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "mime"}, - {org = "ballerina", name = "oauth2"}, - {org = "ballerina", name = "observe"}, - {org = "ballerina", name = "time"}, - {org = "ballerina", name = "url"} -] -modules = [ - {org = "ballerina", packageName = "http", moduleName = "http"}, - {org = "ballerina", packageName = "http", moduleName = "http.httpscerr"} -] - -[[package]] -org = "ballerina" -name = "io" -version = "1.6.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"} -] - -[[package]] -org = "ballerina" -name = "jballerina.java" -version = "0.0.0" -modules = [ - {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "jwt" -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"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "lang.__internal" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.object"} -] - -[[package]] -org = "ballerina" -name = "lang.array" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.__internal"} -] - -[[package]] -org = "ballerina" -name = "lang.decimal" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "lang.int" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.__internal"}, - {org = "ballerina", name = "lang.object"} -] - -[[package]] -org = "ballerina" -name = "lang.object" -version = "0.0.0" - -[[package]] -org = "ballerina" -name = "lang.regexp" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "lang.runtime" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "lang.string" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.regexp"} -] - -[[package]] -org = "ballerina" -name = "lang.value" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "log" -version = "2.10.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"}, - {org = "ballerina", name = "observe"} -] -modules = [ - {org = "ballerina", packageName = "log", moduleName = "log"} -] - -[[package]] -org = "ballerina" -name = "mime" -version = "2.10.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"}, - {org = "ballerina", name = "log"} -] -modules = [ - {org = "ballerina", packageName = "mime", moduleName = "mime"} -] - -[[package]] -org = "ballerina" -name = "oauth2" -version = "2.12.0" -dependencies = [ - {org = "ballerina", name = "cache"}, - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"}, - {org = "ballerina", name = "url"} -] -modules = [ - {org = "ballerina", packageName = "oauth2", moduleName = "oauth2"} -] - -[[package]] -org = "ballerina" -name = "observe" -version = "1.3.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "os" -version = "1.8.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "task" -version = "2.5.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "time" -version = "2.5.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "url" -version = "2.4.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] -modules = [ - {org = "ballerina", packageName = "url", moduleName = "url"} -] - -[[package]] -org = "ballerinax" -name = "wso2.apim.catalog" -version = "1.0.0" -dependencies = [ - {org = "ballerina", name = "constraint"}, - {org = "ballerina", name = "http"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "mime"}, - {org = "ballerina", name = "oauth2"}, - {org = "ballerina", name = "url"} -] -modules = [ - {org = "ballerinax", packageName = "wso2.apim.catalog", moduleName = "wso2.apim.catalog"} -] - From 3410714b71c3f69a216f7febb1718e03d2aef89e Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Sat, 19 Apr 2025 00:56:53 +0530 Subject: [PATCH 3/4] [Automated] Update the native jar versions --- ballerina-tests/Ballerina.toml | 4 +-- ballerina-tests/Dependencies.toml | 49 +++++++++++++++++++------------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/ballerina-tests/Ballerina.toml b/ballerina-tests/Ballerina.toml index ab98af8..fe59851 100644 --- a/ballerina-tests/Ballerina.toml +++ b/ballerina-tests/Ballerina.toml @@ -12,10 +12,10 @@ repository="local" [build-options] remoteManagement=true -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina" artifactId = "wso2.apim.catalog-native" version = "1.0.0" diff --git a/ballerina-tests/Dependencies.toml b/ballerina-tests/Dependencies.toml index ab16b2d..013070c 100644 --- a/ballerina-tests/Dependencies.toml +++ b/ballerina-tests/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.14.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.10.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -47,17 +47,27 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.3" +version = "2.9.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.12.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -72,13 +82,14 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.16" +version = "2.14.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +116,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -124,11 +135,12 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.15.0" scope = "testOnly" 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"}, @@ -231,7 +243,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.12.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -246,12 +258,13 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.12.0" scope = "testOnly" 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 +273,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.14.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -274,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.5.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -283,7 +296,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -296,7 +309,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -320,7 +333,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -329,7 +342,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} From 1d10a034a08cabb45400cbaebd134168f79c3208 Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Sat, 19 Apr 2025 01:29:11 +0530 Subject: [PATCH 4/4] Migrate to java 21 --- build-config/resources/Ballerina.toml | 26 +++++----- build-config/resources/BallerinaTest.toml | 4 +- build-config/resources/CompilerPlugin.toml | 2 +- build.gradle | 1 + compiler-plugin/build.gradle | 9 ++-- gradle.properties | 41 +++++++-------- native/build.gradle | 9 ++-- .../wso2/apim/catalog/ServiceCatalog.java | 2 +- .../sample_project_0/Dependencies.toml | 44 +++++++++------- .../sample_project_1/Dependencies.toml | 50 +++++++++++-------- .../sample_project_2/Dependencies.toml | 44 +++++++++------- .../sample_project_3/Dependencies.toml | 44 +++++++++------- .../sample_project_4/Dependencies.toml | 44 +++++++++------- .../sample_project_5/Dependencies.toml | 46 ++++++++++------- .../sample_project_6/Dependencies.toml | 44 +++++++++------- 15 files changed, 244 insertions(+), 166 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index c34c1f5..c4848d8 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -4,76 +4,76 @@ name = "wso2.apim.catalog" version = "@toml.version@" distribution = "2201.10.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina" artifactId = "wso2.apim.catalog-native" version = "@toml.version@" path = "../native/build/libs/wso2.apim.catalog-native-@project.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-core" version = "@fasterxml.version@" path = "lib/jackson-core-@fasterxml.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-databind" version = "@fasterxml.version@" path = "lib/jackson-databind-@fasterxml.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.core" artifactId = "jackson-annotations" version = "@fasterxml.version@" path = "lib/jackson-annotations-@fasterxml.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.datatype" artifactId = "jackson-datatype-jsr310" version = "@fasterxml.version@" path = "lib/jackson-datatype-jsr310-@fasterxml.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "com.fasterxml.jackson.dataformat" artifactId = "jackson-dataformat-yaml" version = "@fasterxml.version@" path = "lib/jackson-dataformat-yaml-@fasterxml.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.core.v3" artifactId = "swagger-core-jakarta" version = "@swagger.version@" path = "lib/swagger-core-jakarta-@swagger.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.core.v3" artifactId = "swagger-models" version = "@swagger.version@" path = "lib/swagger-models-@swagger.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser-v3" version = "@swagger.version@" path = "lib/swagger-parser-v3-@swagger.parser.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser" version = "@swagger.version@" path = "lib/swagger-parser-@swagger.parser.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.swagger.parser.v3" artifactId = "swagger-parser-core" version = "@swagger.version@" path = "lib/swagger-parser-core-@swagger.parser.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "org.yaml" artifactId = "snakeyaml" version = "@snakeyaml.version@" diff --git a/build-config/resources/BallerinaTest.toml b/build-config/resources/BallerinaTest.toml index e542014..94c6d85 100644 --- a/build-config/resources/BallerinaTest.toml +++ b/build-config/resources/BallerinaTest.toml @@ -12,10 +12,10 @@ repository="local" [build-options] remoteManagement=true -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina" artifactId = "wso2.apim.catalog-native" version = "@toml.version@" diff --git a/build-config/resources/CompilerPlugin.toml b/build-config/resources/CompilerPlugin.toml index 375a04a..896e812 100644 --- a/build-config/resources/CompilerPlugin.toml +++ b/build-config/resources/CompilerPlugin.toml @@ -8,5 +8,5 @@ path = "../compiler-plugin/build/libs/wso2.apim.catalog-compiler-plugin-@project [[dependency]] path = "lib/ballerina-to-openapi-@openapi.version@.jar" -[platform.java17] +[platform.java21] graalvmCompatible = true diff --git a/build.gradle b/build.gradle index 57d4c4c..8036a09 100644 --- a/build.gradle +++ b/build.gradle @@ -86,6 +86,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}" ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}" ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}" + ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsonDataVersion}" ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}" ballerinaStdLibs "io.ballerina.stdlib:time-ballerina:${stdlibTimeVersion}" ballerinaStdLibs "io.ballerina.stdlib:url-ballerina:${stdlibUrlVersion}" diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index 2474151..9af1422 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -19,7 +19,7 @@ plugins { id 'java' id 'checkstyle' - id 'com.github.spotbugs' + id "com.github.spotbugs" } description = 'Ballerina - WSO2 API Manager Compiler Plugin' @@ -60,8 +60,11 @@ checkstyle { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsMain { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/gradle.properties b/gradle.properties index 3182846..5a359a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,11 @@ group=io.ballerina.wso2.apim.catalog version=1.0.0-SNAPSHOT +ballerinaLangVersion=2201.12.0 + puppycrawlCheckstyleVersion=10.12.0 checkstyleToolVersion=10.12.0 -githubSpotbugsVersion=5.0.14 +githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.0 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 @@ -15,29 +17,28 @@ snakeYamlversion=2.0 fasterxmlJacksonCoreVersion=2.15.2 commonsVersion=2.15.1 -ballerinaLangVersion=2201.10.0 - -stdlibIoVersion=1.6.1 -stdlibTimeVersion=2.5.0 -stdlibUrlVersion=2.4.0 +stdlibIoVersion=1.8.0 +stdlibTimeVersion=2.7.0 +stdlibUrlVersion=2.6.0 -stdlibConstraintVersion=1.5.0 -stdlibOsVersion=1.8.0 -stdlibTaskVersion=2.5.0 -stdlibLogVersion=2.10.0 -stdlibCryptoVersion=2.7.2 +stdlibConstraintVersion=1.7.0 +stdlibOsVersion=1.10.0 +stdlibTaskVersion=2.7.0 +stdlibLogVersion=2.12.0 +stdlibCryptoVersion=2.9.0 -stdlibFileVersion=1.10.0 -stdlibMimeVersion=2.10.0 -stdlibCacheVersion=3.8.0 +stdlibFileVersion=1.12.0 +stdlibMimeVersion=2.12.0 +stdlibCacheVersion=3.10.0 -stdlibAuthVersion=2.12.0 -stdlibJwtVersion=2.13.0 -stdlibOAuth2Version=2.12.0 +stdlibAuthVersion=2.14.0 +stdlibJwtVersion=2.15.0 +stdlibOAuth2Version=2.14.0 +stdlibDataJsonDataVersion=1.1.0 -stdlibHttpVersion=2.12.1 +stdlibHttpVersion=2.14.0 openapiVersion=2.0.3 -observeVersion=1.3.0 -observeInternalVersion=1.2.2 +observeVersion=1.5.0 +observeInternalVersion=1.5.0 diff --git a/native/build.gradle b/native/build.gradle index d078380..c6465fc 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -50,7 +50,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 jacoco { toolVersion = "0.8.5" @@ -72,8 +72,11 @@ test { spotbugsMain { ignoreFailures = true - effort = "max" - reportLevel = "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml") if (excludeFile.exists()) { diff --git a/native/src/main/java/io/ballerina/wso2/apim/catalog/ServiceCatalog.java b/native/src/main/java/io/ballerina/wso2/apim/catalog/ServiceCatalog.java index 782eb26..a266bd3 100644 --- a/native/src/main/java/io/ballerina/wso2/apim/catalog/ServiceCatalog.java +++ b/native/src/main/java/io/ballerina/wso2/apim/catalog/ServiceCatalog.java @@ -16,11 +16,11 @@ package io.ballerina.wso2.apim.catalog; -import io.ballerina.runtime.api.Artifact; import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.RecordType; diff --git a/test-resources/sample_project_0/Dependencies.toml b/test-resources/sample_project_0/Dependencies.toml index ea9a507..cb457cd 100644 --- a/test-resources/sample_project_0/Dependencies.toml +++ b/test-resources/sample_project_0/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -34,7 +34,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -45,7 +45,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -53,16 +53,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,12 +82,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +115,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -119,7 +129,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -208,7 +218,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -219,7 +229,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -230,7 +240,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -243,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -251,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -260,7 +270,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/test-resources/sample_project_1/Dependencies.toml b/test-resources/sample_project_1/Dependencies.toml index e2cb91b..c3fa6a5 100644 --- a/test-resources/sample_project_1/Dependencies.toml +++ b/test-resources/sample_project_1/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -24,7 +24,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -36,7 +36,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -47,7 +47,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -55,16 +55,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -75,7 +84,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.0" +version = "1.16.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -107,12 +116,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -139,7 +149,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -153,7 +163,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -242,7 +252,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -253,7 +263,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -264,7 +274,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -285,7 +295,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -294,7 +304,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -303,7 +313,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -311,7 +321,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -319,7 +329,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -330,7 +340,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/test-resources/sample_project_2/Dependencies.toml b/test-resources/sample_project_2/Dependencies.toml index 197668e..6b1f91e 100644 --- a/test-resources/sample_project_2/Dependencies.toml +++ b/test-resources/sample_project_2/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -34,7 +34,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -45,7 +45,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -53,16 +53,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,12 +82,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +115,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -119,7 +129,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -208,7 +218,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -219,7 +229,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -230,7 +240,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -243,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -251,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -260,7 +270,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/test-resources/sample_project_3/Dependencies.toml b/test-resources/sample_project_3/Dependencies.toml index 960b734..2005cd3 100644 --- a/test-resources/sample_project_3/Dependencies.toml +++ b/test-resources/sample_project_3/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -34,7 +34,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -45,7 +45,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -53,16 +53,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,12 +82,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +115,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -119,7 +129,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -208,7 +218,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -219,7 +229,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -230,7 +240,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -243,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -251,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -260,7 +270,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/test-resources/sample_project_4/Dependencies.toml b/test-resources/sample_project_4/Dependencies.toml index e098cab..ec0b488 100644 --- a/test-resources/sample_project_4/Dependencies.toml +++ b/test-resources/sample_project_4/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -34,7 +34,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -45,7 +45,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -53,16 +53,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,12 +82,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +115,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -119,7 +129,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -208,7 +218,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -219,7 +229,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -230,7 +240,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -243,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -251,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -260,7 +270,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/test-resources/sample_project_5/Dependencies.toml b/test-resources/sample_project_5/Dependencies.toml index 43aee59..202290a 100644 --- a/test-resources/sample_project_5/Dependencies.toml +++ b/test-resources/sample_project_5/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -23,7 +23,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -46,7 +46,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -54,16 +54,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -74,12 +83,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -106,7 +116,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -120,7 +130,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -209,7 +219,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -220,7 +230,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -231,7 +241,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -244,7 +254,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -252,7 +262,7 @@ dependencies = [ [[package]] org = "ballerina" name = "openapi" -version = "2.1.0" +version = "2.3.0" modules = [ {org = "ballerina", packageName = "openapi", moduleName = "openapi"} ] @@ -260,7 +270,7 @@ modules = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -278,7 +288,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -286,7 +296,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/test-resources/sample_project_6/Dependencies.toml b/test-resources/sample_project_6/Dependencies.toml index 8484da9..a2991cc 100644 --- a/test-resources/sample_project_6/Dependencies.toml +++ b/test-resources/sample_project_6/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.12.0" [[package]] org = "admin" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -34,7 +34,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.10.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -45,7 +45,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -53,16 +53,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.9.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "1.1.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,12 +82,13 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.12.1" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -105,7 +115,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -119,7 +129,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.15.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -208,7 +218,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -219,7 +229,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -230,7 +240,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.14.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -243,7 +253,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -251,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -260,7 +270,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -277,7 +287,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ]