From 13807244c35e9a74a0fd2ac2c31c93199f3d9534 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Tue, 1 Oct 2024 14:15:59 +0530 Subject: [PATCH 1/9] Migrate to Java 21 --- .github/workflows/build-timestamped-master.yml | 2 +- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/central-publish.yml | 2 +- .github/workflows/process-load-test-result.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/trigger-load-tests.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- README.md | 2 +- ballerina/Ballerina.toml | 4 ++-- ballerina/Dependencies.toml | 2 +- build-config/resources/Ballerina.toml | 4 ++-- compiler-plugin-tests/build.gradle | 9 ++++++--- compiler-plugin/build.gradle | 8 ++++++-- gradle.properties | 8 ++++---- native/build.gradle | 7 +++++-- 16 files changed, 35 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 2d154ffc..f202d1aa 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -14,5 +14,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index f01b6500..e842b036 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21 with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 11922b55..ebe213e7 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21 secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 89d9fecc..14902426 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -7,7 +7,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21 with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index f670066f..2b12c846 100755 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 secrets: inherit with: package-name: cache diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 31e0976d..db98c8e1 100755 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,5 +10,5 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 secrets: inherit diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index 5f478b50..3ee13200 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21 with: repo_name: 'module-ballerina-cache' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerina-cache/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index c02c8ff4..41e8f6ad 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21 secrets: inherit diff --git a/README.md b/README.md index 093cfc40..65fcd786 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ This repository only contains the source code for the package. ### Set up the prerequisites -1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). +1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptium.net/) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e2335d80..fed438b3 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,10 +9,10 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.8.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "cache-native" version = "3.8.0" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index cf30673b..d72c0724 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.0" +distribution-version = "2201.10.0-20240926-231800-8a5a4343" [[package]] org = "ballerina" diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 7b73b5e6..2e973d70 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,10 +9,10 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.8.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "cache-native" version = "@toml.version@" diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 4750fb8b..c663c3c9 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -41,7 +41,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 test { systemProperty "ballerina.offline.flag", "true" @@ -63,9 +63,12 @@ test { } spotbugsTest { + 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") ignoreFailures = true - effort = "max" - reportLevel = "low" + 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/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index 8a265c77..918e1925 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -47,8 +47,12 @@ 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") + ignoreFailures = true + 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 6ead1712..46e66719 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,16 @@ org.gradle.caching=true group=io.ballerina.stdlib version=3.8.1-SNAPSHOT -ballerinaLangVersion=2201.8.0 +ballerinaLangVersion=2201.10.0-20240926-231800-8a5a4343 stdlibTaskVersion=2.5.0 -stdlibTimeVersion=2.4.0 -stdlibConstraintVersion=1.5.0 +stdlibTimeVersion=2.5.1-20240930-120200-e59222b +stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 puppycrawlCheckstyleVersion=10.12.0 ballerinaGradlePluginVersion=2.0.1 testngVersion=7.6.1 jacocoVersion=0.8.10 -githubSpotbugsVersion=5.0.14 +githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 diff --git a/native/build.gradle b/native/build.gradle index 2258c4f2..a59155e6 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -77,8 +77,11 @@ tasks.withType(Checkstyle) { } 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 From efedb3823ffbb65f5d7693f7f3705233f98b17a1 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Thu, 3 Oct 2024 09:01:58 +0530 Subject: [PATCH 2/9] Add updated stdlibTaskVersion --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 46e66719..2db43c9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=3.8.1-SNAPSHOT ballerinaLangVersion=2201.10.0-20240926-231800-8a5a4343 -stdlibTaskVersion=2.5.0 +stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 stdlibTimeVersion=2.5.1-20240930-120200-e59222b stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 From 6aeaf2a9aa17d5aa847fbe65feb32aa1d5c02a4f Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Thu, 3 Oct 2024 10:46:06 +0530 Subject: [PATCH 3/9] Update lang version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2db43c9b..75e84dff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=3.8.1-SNAPSHOT -ballerinaLangVersion=2201.10.0-20240926-231800-8a5a4343 +ballerinaLangVersion=2201.10.0-20241002-115300-57eee14c stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 stdlibTimeVersion=2.5.1-20240930-120200-e59222b stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 From e5a38fe8557eb2f3e78f8f6b60f4d50dd23df265 Mon Sep 17 00:00:00 2001 From: hindujaB Date: Wed, 13 Nov 2024 07:00:24 +0530 Subject: [PATCH 4/9] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 6 +++--- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 37 ++++++++++++++++++++++++++++++----- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index fed438b3..6b244b23 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" authors = ["Ballerina"] keywords = ["cache", "LRU"] repository = "https://github.com/ballerina-platform/module-ballerina-cache" @@ -15,5 +15,5 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "cache-native" -version = "3.8.0" -path = "../native/build/libs/cache-native-3.8.0.jar" +version = "3.8.1" +path = "../native/build/libs/cache-native-3.8.1-SNAPSHOT.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index c6a72da0..a3966353 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "cache-compiler-plugin" class = "io.ballerina.stdlib.cache.compiler.CacheCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/cache-compiler-plugin-3.8.0.jar" +path = "../compiler-plugin/build/libs/cache-compiler-plugin-3.8.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index d72c0724..d00b867e 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0-20240926-231800-8a5a4343" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -42,6 +42,26 @@ modules = [ {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "lang.__internal" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "lang.array" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"} +] + [[package]] org = "ballerina" name = "lang.error" @@ -51,6 +71,12 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "lang.object" +version = "0.0.0" +scope = "testOnly" + [[package]] org = "ballerina" name = "lang.runtime" @@ -66,7 +92,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -82,6 +108,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -91,7 +118,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From c9678d3b722f7534f08e3c84666f2bd94267a13b Mon Sep 17 00:00:00 2001 From: hindujaB Date: Wed, 13 Nov 2024 12:48:09 +0530 Subject: [PATCH 5/9] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index d00b867e..55328bc0 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.1" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -118,7 +118,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.1" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From 7d7994b2db8b5750fb284401e1011e41e4ac8454 Mon Sep 17 00:00:00 2001 From: hindujaB Date: Wed, 13 Nov 2024 12:50:35 +0530 Subject: [PATCH 6/9] Bump versions for java 21 --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 75e84dff..342a7a8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ org.gradle.caching=true group=io.ballerina.stdlib version=3.8.1-SNAPSHOT -ballerinaLangVersion=2201.10.0-20241002-115300-57eee14c -stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 -stdlibTimeVersion=2.5.1-20240930-120200-e59222b -stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 +ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 +stdlibTaskVersion=2.5.1-20241113-123500-f905281 +stdlibTimeVersion=2.6.0-20241113-073800-201b904 +stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 puppycrawlCheckstyleVersion=10.12.0 ballerinaGradlePluginVersion=2.0.1 From a590e63f1977682cbb6aee5e60ea87454de84f8d Mon Sep 17 00:00:00 2001 From: hindujaB Date: Wed, 13 Nov 2024 12:50:47 +0530 Subject: [PATCH 7/9] Revert "[Automated] Update native jar versions in toml files" This reverts commit c9678d3b722f7534f08e3c84666f2bd94267a13b. --- ballerina/Dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 55328bc0..d00b867e 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "constraint" -version = "1.6.0" +version = "1.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -118,7 +118,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.6.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From d112ca34821447c3c7b0bfd7a24f908a9a4004e7 Mon Sep 17 00:00:00 2001 From: hindujaB Date: Wed, 13 Nov 2024 12:50:51 +0530 Subject: [PATCH 8/9] Revert "[Automated] Update native jar versions in toml files" This reverts commit e5a38fe8557eb2f3e78f8f6b60f4d50dd23df265. --- ballerina/Ballerina.toml | 6 +++--- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 37 +++++------------------------------ 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 6b244b23..fed438b3 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "cache" -version = "3.8.1" +version = "3.8.0" authors = ["Ballerina"] keywords = ["cache", "LRU"] repository = "https://github.com/ballerina-platform/module-ballerina-cache" @@ -15,5 +15,5 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "cache-native" -version = "3.8.1" -path = "../native/build/libs/cache-native-3.8.1-SNAPSHOT.jar" +version = "3.8.0" +path = "../native/build/libs/cache-native-3.8.0.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index a3966353..c6a72da0 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "cache-compiler-plugin" class = "io.ballerina.stdlib.cache.compiler.CacheCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/cache-compiler-plugin-3.8.1-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/cache-compiler-plugin-3.8.0.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index d00b867e..d72c0724 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241112-214900-6b80ab87" +distribution-version = "2201.10.0-20240926-231800-8a5a4343" [[package]] org = "ballerina" name = "cache" -version = "3.8.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -26,7 +26,7 @@ modules = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.1" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -42,26 +42,6 @@ modules = [ {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} ] -[[package]] -org = "ballerina" -name = "lang.__internal" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.object"} -] - -[[package]] -org = "ballerina" -name = "lang.array" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.__internal"} -] - [[package]] org = "ballerina" name = "lang.error" @@ -71,12 +51,6 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"} ] -[[package]] -org = "ballerina" -name = "lang.object" -version = "0.0.0" -scope = "testOnly" - [[package]] org = "ballerina" name = "lang.runtime" @@ -92,7 +66,7 @@ modules = [ [[package]] org = "ballerina" name = "task" -version = "2.5.1" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -108,7 +82,6 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -118,7 +91,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.1" +version = "2.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From 28b26742738f758fd4ac29188491d2d8a707f857 Mon Sep 17 00:00:00 2001 From: hindujaB Date: Mon, 18 Nov 2024 10:36:55 +0530 Subject: [PATCH 9/9] Revert workflow branches --- .github/workflows/build-timestamped-master.yml | 2 +- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/central-publish.yml | 2 +- .github/workflows/process-load-test-result.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/trigger-load-tests.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index f202d1aa..2d154ffc 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -14,5 +14,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index e842b036..f01b6500 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index ebe213e7..11922b55 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 14902426..89d9fecc 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -7,7 +7,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 2b12c846..f670066f 100755 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main secrets: inherit with: package-name: cache diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index db98c8e1..31e0976d 100755 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,5 +10,5 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main secrets: inherit diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index 3ee13200..5f478b50 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main with: repo_name: 'module-ballerina-cache' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerina-cache/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 41e8f6ad..c02c8ff4 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main secrets: inherit