From e4607c3afa156b71c467548a37ec3d291c68245b Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Tue, 12 Nov 2024 09:51:05 +0530 Subject: [PATCH 1/3] Update version --- .github/workflows/build-main.yml | 4 ++-- .github/workflows/central-publish.yml | 2 +- .github/workflows/daily-build.yml | 4 ++-- .github/workflows/graalvm-check.yml | 4 ++-- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- ballerina/Ballerina.toml | 2 +- gradle.properties | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index bf0b2fd..34262b0 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -6,13 +6,13 @@ on: ballerina_version: description: 'Ballerina version' required: true - default: '2201.9.0' + default: '2201.10.0' push: branches: - main env: - BALLERINA_DISTRIBUTION_VERSION: 2201.9.0 # Update this with the latest Ballerina version + BALLERINA_DISTRIBUTION_VERSION: 2201.10.0 # Update this with the latest Ballerina version jobs: build: diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index b99a8dd..8bbc5a9 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -6,7 +6,7 @@ on: ballerina_version: description: 'Ballerina version' required: true - default: '2201.9.0' + default: '2201.10.0' environment: type: choice description: Select environment diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 08e6c76..51bea32 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -8,10 +8,10 @@ on: ballerina_version: description: 'Ballerina version' required: true - default: '2201.9.0' + default: '2201.10.0' env: - BALLERINA_DISTRIBUTION_VERSION: 2201.9.0 # Update this with the latest Ballerina version + BALLERINA_DISTRIBUTION_VERSION: 2201.10.0 # Update this with the latest Ballerina version jobs: build: diff --git a/.github/workflows/graalvm-check.yml b/.github/workflows/graalvm-check.yml index ac8d629..0138954 100644 --- a/.github/workflows/graalvm-check.yml +++ b/.github/workflows/graalvm-check.yml @@ -8,10 +8,10 @@ on: ballerina_version: description: 'Ballerina version' required: true - default: '2201.9.0' + default: '2201.10.0' env: - BALLERINA_DISTRIBUTION_VERSION: 2201.9.0 # Update this with the latest Ballerina version + BALLERINA_DISTRIBUTION_VERSION: 2201.10.0 # Update this with the latest Ballerina version jobs: build: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 389078a..d2de80a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -6,7 +6,7 @@ on: distribution_version: description: 'Ballerina distribution version (e.g.; 2201.9.0)' required: true - default: '2201.9.0' + default: '2201.10.0' jobs: publish-release: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 916be00..1ef9d05 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -3,7 +3,7 @@ name: Validate Pull Request on: pull_request env: - BALLERINA_DISTRIBUTION_VERSION: 2201.9.0 # Update this with the latest Ballerina version + BALLERINA_DISTRIBUTION_VERSION: 2201.10.0 # Update this with the latest Ballerina version jobs: ubuntu-build: diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index d49ebe0..e3f13c6 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -18,7 +18,7 @@ org = "ballerinax" name = "jaeger" version = "@toml.version@" -distribution = "2201.9.0" +distribution = "2201.10.0" [platform.java17] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index 3385f81..3d75679 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ # limitations under the License. group=org.ballerinalang -version=0.5.4-SNAPSHOT -ballerinaLangVersion=2201.9.0 +version=1.0.0-SNAPSHOT +ballerinaLangVersion=2201.10.0 org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs='-Dfile.encoding=UTF-8' From 1fac3597f832b708867efb8e3846f2c62d565449 Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Tue, 12 Nov 2024 10:03:27 +0530 Subject: [PATCH 2/3] Remove Dependencies.toml in ballerina tests --- .../jaeger-server-tests/Ballerina.toml | 2 +- .../jaeger-server-tests/Dependencies.toml | 358 ------------------ 2 files changed, 1 insertion(+), 359 deletions(-) delete mode 100644 ballerina-tests/jaeger-server-tests/Dependencies.toml diff --git a/ballerina-tests/jaeger-server-tests/Ballerina.toml b/ballerina-tests/jaeger-server-tests/Ballerina.toml index 6314c82..8d471e4 100644 --- a/ballerina-tests/jaeger-server-tests/Ballerina.toml +++ b/ballerina-tests/jaeger-server-tests/Ballerina.toml @@ -2,7 +2,7 @@ org = "ballerinax" name = "jaeger_server_tests" version = "0.1.0" -distribution = "2201.8.3" +distribution = "2201.10.0" [build-options] observabilityIncluded = true diff --git a/ballerina-tests/jaeger-server-tests/Dependencies.toml b/ballerina-tests/jaeger-server-tests/Dependencies.toml deleted file mode 100644 index 4ef3c27..0000000 --- a/ballerina-tests/jaeger-server-tests/Dependencies.toml +++ /dev/null @@ -1,358 +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.8.5-SNAPSHOT" - -[[package]] -org = "ballerina" -name = "auth" -version = "2.10.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.7.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"} -] - -[[package]] -org = "ballerina" -name = "crypto" -version = "2.6.1" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] - -[[package]] -org = "ballerina" -name = "file" -version = "1.9.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.10.5" -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.0" -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.10.0" -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 = "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.error" -version = "0.0.0" -scope = "testOnly" -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"} -] -modules = [ - {org = "ballerina", packageName = "lang.runtime", moduleName = "lang.runtime"} -] - -[[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.9.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"}, - {org = "ballerina", name = "observe"} -] - -[[package]] -org = "ballerina" -name = "mime" -version = "2.9.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} -] - -[[package]] -org = "ballerina" -name = "oauth2" -version = "2.10.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"} -] - -[[package]] -org = "ballerina" -name = "observe" -version = "1.2.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] -modules = [ - {org = "ballerina", packageName = "observe", moduleName = "observe"}, - {org = "ballerina", packageName = "observe", moduleName = "observe.mockextension"} -] - -[[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 = "test" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.error"} -] -modules = [ - {org = "ballerina", packageName = "test", moduleName = "test"} -] - -[[package]] -org = "ballerina" -name = "time" -version = "2.4.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "toml" -version = "0.5.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "file"}, - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "time"} -] -modules = [ - {org = "ballerina", packageName = "toml", moduleName = "toml"}, - {org = "ballerina", packageName = "toml", moduleName = "toml.lexer"}, - {org = "ballerina", packageName = "toml", moduleName = "toml.parser"}, - {org = "ballerina", packageName = "toml", moduleName = "toml.writer"} -] - -[[package]] -org = "ballerina" -name = "url" -version = "2.4.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerinai" -name = "observe" -version = "0.0.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "observe"} -] -modules = [ - {org = "ballerinai", packageName = "observe", moduleName = "observe"} -] - -[[package]] -org = "ballerinax" -name = "jaeger" -version = "0.5.0" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "observe"} -] -modules = [ - {org = "ballerinax", packageName = "jaeger", moduleName = "jaeger"} -] - -[[package]] -org = "ballerinax" -name = "jaeger_server_tests" -version = "0.1.0" -dependencies = [ - {org = "ballerina", name = "http"}, - {org = "ballerina", name = "lang.runtime"}, - {org = "ballerina", name = "observe"}, - {org = "ballerina", name = "test"}, - {org = "ballerina", name = "toml"}, - {org = "ballerinai", name = "observe"}, - {org = "ballerinax", name = "jaeger"} -] -modules = [ - {org = "ballerinax", packageName = "jaeger_server_tests", moduleName = "jaeger_server_tests"} -] - From f56406caf2ff86ce5342d23ae874c7fdbdabdffd Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Tue, 12 Nov 2024 10:15:09 +0530 Subject: [PATCH 3/3] Remove Dependencies.toml in ballerina tests --- ballerina-tests/build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index d064283..2bd2cce 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -60,8 +60,6 @@ def testPackages = ["jaeger-server-tests"] def jaegerServerTestConfigFile = new File("${project.projectDir}/jaeger-server-tests/Ballerina.toml") def jaegerServerTestOriginalConfig = jaegerServerTestConfigFile.text -def jaegerServerTestDependenciesFile = new File("${project.projectDir}/jaeger-server-tests/Dependencies.toml") -def jaegerServerTestOriginalDependencies = jaegerServerTestDependenciesFile.text def stripBallerinaExtensionVersion(String extVersion) { if (extVersion.matches(project.ext.timestampedVersionRegex)) { @@ -117,8 +115,6 @@ task updateTomlVerions { doLast { def newConfig = jaegerServerTestConfigFile.text.replace("@toml.version@", tomlVersion) jaegerServerTestConfigFile.text = newConfig - def newDependencies = jaegerServerTestDependenciesFile.text.replace("@toml.version@", tomlVersion) - jaegerServerTestDependenciesFile.text = newDependencies } } @@ -179,7 +175,6 @@ task stopJaegerServer() { task revertTomlFile { doLast { jaegerServerTestConfigFile.text = jaegerServerTestOriginalConfig - jaegerServerTestDependenciesFile.text = jaegerServerTestOriginalDependencies } }