From 4880838befa32cb2f738854976f55af90afbca36 Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 10:31:20 +0530 Subject: [PATCH 1/8] Add protoc tool to choreo extension --- build.gradle | 1 + gradle.properties | 1 + settings.gradle | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8c5b0c3..cad8b56 100644 --- a/build.gradle +++ b/build.gradle @@ -100,6 +100,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:grpc-ballerina:${stdlibGrpcVersion}" ballerinaStdLibs "io.ballerina.stdlib:random-ballerina:${stdlibRandomVersion}" ballerinaStdLibs "io.ballerina.stdlib:protobuf-ballerina:${stdlibProtobufVersion}" + ballerinaStdLibs "io.ballerina:protoc-tools:${protocToolVersion}" } checkstyle { diff --git a/gradle.properties b/gradle.properties index 17cb5bb..cb7ac8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,6 +54,7 @@ stdlibTaskVersion=2.2.1 stdlibUrlVersion=2.2.1 stdlibRandomVersion=1.2.1 stdlibProtobufVersion=1.2.1 +protocToolVersion=0.2.0-20230821-121200-8933a55 # Test Dependency Versions testngVersion=7.6.1 diff --git a/settings.gradle b/settings.gradle index 97f8820..f183663 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,12 +23,12 @@ rootProject.name = 'module-ballerinax-choreo' include(':build-config:checkstyle') include(':choreo-extension-ballerina') include(':choreo-extension-native') -//include(':choreo-extension-tests') +include(':choreo-extension-tests') project(':build-config:checkstyle').projectDir = file('build-config/checkstyle') project(':choreo-extension-ballerina').projectDir = file('choreo-extension-ballerina') project(':choreo-extension-native').projectDir = file('choreo-extension-native') -//project(':choreo-extension-tests').projectDir = file('choreo-extension-tests') +project(':choreo-extension-tests').projectDir = file('choreo-extension-tests') gradleEnterprise { buildScan { From 823d220021546dea90b38eb667703a6f2a1fc282 Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 10:42:41 +0530 Subject: [PATCH 2/8] Add missing dependencies to gradel task --- choreo-extension-ballerina/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/choreo-extension-ballerina/build.gradle b/choreo-extension-ballerina/build.gradle index 0d0e3cb..9d59bae 100644 --- a/choreo-extension-ballerina/build.gradle +++ b/choreo-extension-ballerina/build.gradle @@ -180,6 +180,11 @@ task ballerinaBuild { dependsOn(":choreo-extension-ballerina:compileJava") dependsOn(":choreo-extension-ballerina:jar") dependsOn(":choreo-extension-ballerina:processResources") + dependsOn(":choreo-extension-ballerina:compileTestJava") + dependsOn(":choreo-extension-ballerina:checkstyleMain") + dependsOn(":choreo-extension-ballerina:checkstyleTest") + dependsOn(":choreo-extension-ballerina:spotbugsMain") + dependsOn(":choreo-extension-ballerina:spotbugsTest") finalizedBy revertTomlFile finalizedBy ":commitTomlFiles" From 3c3b2cc08194bc5e74c92fd084ef7b78fc10674f Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 11:16:45 +0530 Subject: [PATCH 3/8] Update dependencies to latest versions --- gradle.properties | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index cb7ac8d..ffbcee4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,29 +31,29 @@ protobufVersion=3.23.4 perfmarkVersion=0.25.0 # Observe Modules -observeVersion=1.1.0 -observeInternalVersion=1.1.0 +observeVersion=1.2.0-20230815-095100-d0b0de4 +observeInternalVersion=1.2.0-20230815-095400-666c698 # Test Module Dependecy Versions -stdlibGrpcVersion=1.9.1-20230809-211700-feffbef -stdlibCryptoVersion=2.2.1 -stdlibIoVersion=1.5.0 -stdlibLogVersion=2.8.1-20230718-085900-36c385c -stdlibHttpVersion=2.2.1 -stdlibJwtVersion=2.2.1 -stdlibUuidVersion=1.2.1 -stdlibOAuth2Version=2.2.1 -stdlibFileVersion=1.2.1 +stdlibGrpcVersion=1.10.0-20230816-004100-2c618f2 +stdlibCryptoVersion=2.5.0-20230815-095600-0ee3198 +stdlibIoVersion=1.6.0-20230815-095000-775a431 +stdlibLogVersion=2.9.0-20230816-002000-eaea069 +stdlibHttpVersion=2.10.0-20230816-003400-5c82fda +stdlibJwtVersion=2.10.0-20230816-003800-d504fd5 +stdlibUuidVersion=1.7.0-20230816-001700-9933a41 +stdlibOAuth2Version=2.10.0-20230816-002400-b6cea6c +stdlibFileVersion=1.9.0-20230816-002900-21b1e5f stdlibRegexVersion=1.2.1 -stdlibTimeVersion=2.2.1 -stdlibOsVersion=1.2.1 -stdlibAuthVersion=2.2.1 -stdlibCacheVersion=3.2.1 -stdlibMimeVersion=2.2.1 -stdlibTaskVersion=2.2.1 -stdlibUrlVersion=2.2.1 -stdlibRandomVersion=1.2.1 -stdlibProtobufVersion=1.2.1 +stdlibTimeVersion=2.4.0-20230815-095100-ad36dad +stdlibOsVersion=1.8.0-20230815-095700-96a4c58 +stdlibAuthVersion=2.10.0-20230816-002400-d604285 +stdlibCacheVersion=3.7.0-20230816-002400-1047212 +stdlibMimeVersion=2.9.0-20230816-002400-359c461 +stdlibTaskVersion=2.5.0-20230815-220300-8faaba9 +stdlibUrlVersion=2.4.0-20230815-095600-c486afa +stdlibRandomVersion=1.5.0-20230815-220300-6c34551 +stdlibProtobufVersion=1.6.0-20230815-220300-57f52f7 protocToolVersion=0.2.0-20230821-121200-8933a55 # Test Dependency Versions From 89c5806b4df39d0b13f047b859f2a8739980d189 Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 11:21:18 +0530 Subject: [PATCH 4/8] [Automated] Update ballerina package versions --- choreo-extension-ballerina/Dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/choreo-extension-ballerina/Dependencies.toml b/choreo-extension-ballerina/Dependencies.toml index 8747131..f13a09a 100644 --- a/choreo-extension-ballerina/Dependencies.toml +++ b/choreo-extension-ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.8.0-20230726-145300-b2bdf796" [[package]] org = "ballerina" name = "io" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -38,7 +38,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.1.0" +version = "1.2.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From 9cc53baf17028e38a16aea0df5532f2b12ec4bcf Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 11:52:00 +0530 Subject: [PATCH 5/8] Add missing dependencies --- build.gradle | 1 + .../Dependencies.toml | 319 ------------------ gradle.properties | 1 + 3 files changed, 2 insertions(+), 319 deletions(-) delete mode 100644 choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml diff --git a/build.gradle b/build.gradle index cad8b56..fe7670c 100644 --- a/build.gradle +++ b/build.gradle @@ -101,6 +101,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:random-ballerina:${stdlibRandomVersion}" ballerinaStdLibs "io.ballerina.stdlib:protobuf-ballerina:${stdlibProtobufVersion}" ballerinaStdLibs "io.ballerina:protoc-tools:${protocToolVersion}" + ballerinaStdLibs "io.ballerina.stdlib:constraint-ballerina:${project.stdlibConstraintVersion}" } checkstyle { diff --git a/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml b/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml deleted file mode 100644 index 537e814..0000000 --- a/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml +++ /dev/null @@ -1,319 +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" - -[[package]] -org = "ballerina" -name = "auth" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.array"}, - {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "regex"} -] - -[[package]] -org = "ballerina" -name = "cache" -version = "3.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "task"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "crypto" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "file" -version = "1.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "os"}, - {org = "ballerina", name = "regex"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "grpc" -version = "1.2.2" -dependencies = [ - {org = "ballerina", name = "auth"}, - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "jwt"}, - {org = "ballerina", name = "lang.runtime"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "oauth2"}, - {org = "ballerina", name = "protobuf"}, - {org = "ballerina", name = "regex"}, - {org = "ballerina", name = "time"} -] -modules = [ - {org = "ballerina", packageName = "grpc", moduleName = "grpc"}, - {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.any"}, - {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.duration"}, - {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.struct"}, - {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.timestamp"}, - {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.wrappers"} -] - -[[package]] -org = "ballerina" -name = "http" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "auth"}, - {org = "ballerina", name = "cache"}, - {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.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 = "regex"}, - {org = "ballerina", name = "time"}, - {org = "ballerina", name = "url"} -] -modules = [ - {org = "ballerina", packageName = "http", moduleName = "http"} -] - -[[package]] -org = "ballerina" -name = "io" -version = "1.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"} -] - -[[package]] -org = "ballerina" -name = "jballerina.java" -version = "0.0.0" - -[[package]] -org = "ballerina" -name = "jwt" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "cache"}, - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"}, - {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "regex"}, - {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"} -] - -[[package]] -org = "ballerina" -name = "lang.object" -version = "0.0.0" - -[[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"} -] - -[[package]] -org = "ballerina" -name = "lang.value" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "log" -version = "2.2.1" -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.2.1" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} -] - -[[package]] -org = "ballerina" -name = "oauth2" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "cache"}, - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "observe" -version = "1.0.3" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "os" -version = "1.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "protobuf" -version = "1.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] -modules = [ - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.any"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.duration"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.empty"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.struct"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.timestamp"}, - {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.wrappers"} -] - -[[package]] -org = "ballerina" -name = "regex" -version = "1.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "task" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "time" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "url" -version = "2.2.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina_test" -name = "choreo_periscope_backend" -version = "0.1.0" -dependencies = [ - {org = "ballerina", name = "grpc"}, - {org = "ballerina", name = "http"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "protobuf"} -] -modules = [ - {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend"}, - {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend.handshake"}, - {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend.telemetry"} -] - - diff --git a/gradle.properties b/gradle.properties index ffbcee4..043c642 100644 --- a/gradle.properties +++ b/gradle.properties @@ -55,6 +55,7 @@ stdlibUrlVersion=2.4.0-20230815-095600-c486afa stdlibRandomVersion=1.5.0-20230815-220300-6c34551 stdlibProtobufVersion=1.6.0-20230815-220300-57f52f7 protocToolVersion=0.2.0-20230821-121200-8933a55 +stdlibConstraintVersion=1.4.0-20230815-095500-4e8fae5 # Test Dependency Versions testngVersion=7.6.1 From 756c22a314ad0ea6685b1bf9e43b9e2c7245bdab Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 12:33:26 +0530 Subject: [PATCH 6/8] Add Dependencies.toml --- .../Dependencies.toml | 319 ++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml diff --git a/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml b/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml new file mode 100644 index 0000000..537e814 --- /dev/null +++ b/choreo-extension-tests/src/test/resources/bal/choreo_periscope_backend/Dependencies.toml @@ -0,0 +1,319 @@ +# 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" + +[[package]] +org = "ballerina" +name = "auth" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.string"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "regex"} +] + +[[package]] +org = "ballerina" +name = "cache" +version = "3.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "task"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "crypto" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "file" +version = "1.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "os"}, + {org = "ballerina", name = "regex"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "grpc" +version = "1.2.2" +dependencies = [ + {org = "ballerina", name = "auth"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "jwt"}, + {org = "ballerina", name = "lang.runtime"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "oauth2"}, + {org = "ballerina", name = "protobuf"}, + {org = "ballerina", name = "regex"}, + {org = "ballerina", name = "time"} +] +modules = [ + {org = "ballerina", packageName = "grpc", moduleName = "grpc"}, + {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.any"}, + {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.duration"}, + {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.struct"}, + {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.timestamp"}, + {org = "ballerina", packageName = "grpc", moduleName = "grpc.types.wrappers"} +] + +[[package]] +org = "ballerina" +name = "http" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "auth"}, + {org = "ballerina", name = "cache"}, + {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.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 = "regex"}, + {org = "ballerina", name = "time"}, + {org = "ballerina", name = "url"} +] +modules = [ + {org = "ballerina", packageName = "http", moduleName = "http"} +] + +[[package]] +org = "ballerina" +name = "io" +version = "1.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"} +] + +[[package]] +org = "ballerina" +name = "jballerina.java" +version = "0.0.0" + +[[package]] +org = "ballerina" +name = "jwt" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "lang.string"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "regex"}, + {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"} +] + +[[package]] +org = "ballerina" +name = "lang.object" +version = "0.0.0" + +[[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"} +] + +[[package]] +org = "ballerina" +name = "lang.value" +version = "0.0.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "log" +version = "2.2.1" +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.2.1" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"} +] + +[[package]] +org = "ballerina" +name = "oauth2" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "cache"}, + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "observe" +version = "1.0.3" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "os" +version = "1.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "protobuf" +version = "1.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] +modules = [ + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.any"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.duration"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.empty"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.struct"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.timestamp"}, + {org = "ballerina", packageName = "protobuf", moduleName = "protobuf.types.wrappers"} +] + +[[package]] +org = "ballerina" +name = "regex" +version = "1.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "task" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] + +[[package]] +org = "ballerina" +name = "time" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "url" +version = "2.2.1" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina_test" +name = "choreo_periscope_backend" +version = "0.1.0" +dependencies = [ + {org = "ballerina", name = "grpc"}, + {org = "ballerina", name = "http"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "protobuf"} +] +modules = [ + {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend"}, + {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend.handshake"}, + {org = "ballerina_test", packageName = "choreo_periscope_backend", moduleName = "choreo_periscope_backend.telemetry"} +] + + From c9d34aaa05e1f620174f8069c5b89f5321d3aa05 Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 13:36:04 +0530 Subject: [PATCH 7/8] Disable tests --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index f183663..97f8820 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,12 +23,12 @@ rootProject.name = 'module-ballerinax-choreo' include(':build-config:checkstyle') include(':choreo-extension-ballerina') include(':choreo-extension-native') -include(':choreo-extension-tests') +//include(':choreo-extension-tests') project(':build-config:checkstyle').projectDir = file('build-config/checkstyle') project(':choreo-extension-ballerina').projectDir = file('choreo-extension-ballerina') project(':choreo-extension-native').projectDir = file('choreo-extension-native') -project(':choreo-extension-tests').projectDir = file('choreo-extension-tests') +//project(':choreo-extension-tests').projectDir = file('choreo-extension-tests') gradleEnterprise { buildScan { From 750cff2edb148a5a506b5675621554d2e347e65c Mon Sep 17 00:00:00 2001 From: MadhukaHarith Date: Wed, 23 Aug 2023 13:40:49 +0530 Subject: [PATCH 8/8] Revert updating dependencies --- build.gradle | 1 - choreo-extension-ballerina/Dependencies.toml | 4 +- choreo-extension-ballerina/build.gradle | 5 --- gradle.properties | 41 ++++++++++---------- 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index fe7670c..cad8b56 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,6 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:random-ballerina:${stdlibRandomVersion}" ballerinaStdLibs "io.ballerina.stdlib:protobuf-ballerina:${stdlibProtobufVersion}" ballerinaStdLibs "io.ballerina:protoc-tools:${protocToolVersion}" - ballerinaStdLibs "io.ballerina.stdlib:constraint-ballerina:${project.stdlibConstraintVersion}" } checkstyle { diff --git a/choreo-extension-ballerina/Dependencies.toml b/choreo-extension-ballerina/Dependencies.toml index f13a09a..8747131 100644 --- a/choreo-extension-ballerina/Dependencies.toml +++ b/choreo-extension-ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.8.0-20230726-145300-b2bdf796" [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -38,7 +38,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.0" +version = "1.1.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] diff --git a/choreo-extension-ballerina/build.gradle b/choreo-extension-ballerina/build.gradle index 9d59bae..0d0e3cb 100644 --- a/choreo-extension-ballerina/build.gradle +++ b/choreo-extension-ballerina/build.gradle @@ -180,11 +180,6 @@ task ballerinaBuild { dependsOn(":choreo-extension-ballerina:compileJava") dependsOn(":choreo-extension-ballerina:jar") dependsOn(":choreo-extension-ballerina:processResources") - dependsOn(":choreo-extension-ballerina:compileTestJava") - dependsOn(":choreo-extension-ballerina:checkstyleMain") - dependsOn(":choreo-extension-ballerina:checkstyleTest") - dependsOn(":choreo-extension-ballerina:spotbugsMain") - dependsOn(":choreo-extension-ballerina:spotbugsTest") finalizedBy revertTomlFile finalizedBy ":commitTomlFiles" diff --git a/gradle.properties b/gradle.properties index 043c642..cb7ac8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,31 +31,30 @@ protobufVersion=3.23.4 perfmarkVersion=0.25.0 # Observe Modules -observeVersion=1.2.0-20230815-095100-d0b0de4 -observeInternalVersion=1.2.0-20230815-095400-666c698 +observeVersion=1.1.0 +observeInternalVersion=1.1.0 # Test Module Dependecy Versions -stdlibGrpcVersion=1.10.0-20230816-004100-2c618f2 -stdlibCryptoVersion=2.5.0-20230815-095600-0ee3198 -stdlibIoVersion=1.6.0-20230815-095000-775a431 -stdlibLogVersion=2.9.0-20230816-002000-eaea069 -stdlibHttpVersion=2.10.0-20230816-003400-5c82fda -stdlibJwtVersion=2.10.0-20230816-003800-d504fd5 -stdlibUuidVersion=1.7.0-20230816-001700-9933a41 -stdlibOAuth2Version=2.10.0-20230816-002400-b6cea6c -stdlibFileVersion=1.9.0-20230816-002900-21b1e5f +stdlibGrpcVersion=1.9.1-20230809-211700-feffbef +stdlibCryptoVersion=2.2.1 +stdlibIoVersion=1.5.0 +stdlibLogVersion=2.8.1-20230718-085900-36c385c +stdlibHttpVersion=2.2.1 +stdlibJwtVersion=2.2.1 +stdlibUuidVersion=1.2.1 +stdlibOAuth2Version=2.2.1 +stdlibFileVersion=1.2.1 stdlibRegexVersion=1.2.1 -stdlibTimeVersion=2.4.0-20230815-095100-ad36dad -stdlibOsVersion=1.8.0-20230815-095700-96a4c58 -stdlibAuthVersion=2.10.0-20230816-002400-d604285 -stdlibCacheVersion=3.7.0-20230816-002400-1047212 -stdlibMimeVersion=2.9.0-20230816-002400-359c461 -stdlibTaskVersion=2.5.0-20230815-220300-8faaba9 -stdlibUrlVersion=2.4.0-20230815-095600-c486afa -stdlibRandomVersion=1.5.0-20230815-220300-6c34551 -stdlibProtobufVersion=1.6.0-20230815-220300-57f52f7 +stdlibTimeVersion=2.2.1 +stdlibOsVersion=1.2.1 +stdlibAuthVersion=2.2.1 +stdlibCacheVersion=3.2.1 +stdlibMimeVersion=2.2.1 +stdlibTaskVersion=2.2.1 +stdlibUrlVersion=2.2.1 +stdlibRandomVersion=1.2.1 +stdlibProtobufVersion=1.2.1 protocToolVersion=0.2.0-20230821-121200-8933a55 -stdlibConstraintVersion=1.4.0-20230815-095500-4e8fae5 # Test Dependency Versions testngVersion=7.6.1