Merge pull request #572 from warunalakshitha/syncMaster

Sync master to Java 21 branch
ballerina-platform · Nov 16, 2024 · 189a4e5 · 189a4e5
2 parents f7e16a8 + d005d27
commit 189a4e5
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 37 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Generate Codecov Report
         uses: codecov/codecov-action@v2
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ballerinai-transaction
           path: target/ballerinai-transaction/
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -6,7 +6,7 @@ on:
             lang_tag:
                 description: Branch/Release Tag of the Ballerina Lang
                 required: true
-                default: master
+                default: transaction-recovery
             lang_version:
                 description: Ballerina Lang Version (If given ballerina lang buid will be skipped)
                 required: false

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -26,7 +26,7 @@ jobs:
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --scan --no-daemon
       - name: Archive Error Log
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Ballerina Internal Log

diff --git a/build.gradle b/build.gradle
@@ -98,6 +98,7 @@ subprojects {
         ballerinaStdLibs "io.ballerina.stdlib:file-ballerina:${stdlibFileVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:crypto-ballerina:${stdlibCryptoVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}"
+        ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsonDataVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:mime-ballerina:${stdlibMimeVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}"

diff --git a/gradle.properties b/gradle.properties
@@ -8,25 +8,26 @@ shadowJarPluginVersion=8.1.1
 downloadPluginVersion=5.4.0
 releasePluginVersion=2.8.0
 
-ballerinaLangVersion=2201.10.0-20241019-091600-89e54c08
-stdlibIoVersion=1.6.2-20240928-084100-656404f
-stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396
-stdlibOsVersion=1.8.1-20241001-120600-dd1626e
-stdlibUuidVersion=1.8.1-20241009-134600-a05012b
-stdlibHttpVersion=2.12.1-20241018-081800-bb91312
-stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1
-stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4
-stdlibTimeVersion=2.5.1-20240930-120200-e59222b
-stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0
-stdlibAuthVersion=2.12.1-20241010-130800-733dbef
-stdlibCacheVersion=3.8.1-20241007-154900-63f4403
-stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab
-stdlibFileVersion=1.10.1-20241007-160900-03f7b64
-stdlibTaskVersion=2.5.1-20241002-145700-5bdb843
-stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94
-stdlibOAuth2Version=2.12.1-20241010-123600-0e0cfcc
+ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
+stdlibIoVersion=1.6.2-20241112-233100-995cf5f
+stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5
+stdlibOsVersion=1.8.1-20241113-122000-cca973b
+stdlibUuidVersion=1.8.1-20241113-154400-443c67b
+stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a
+stdlibUrlVersion=2.4.1-20241113-073900-335ff51
+stdlibLogVersion=2.10.1-20241113-120000-4577868
+stdlibTimeVersion=2.6.0-20241113-073800-201b904
+stdlibMimeVersion=2.10.2-20241113-154200-d953747
+stdlibAuthVersion=2.12.1-20241113-162300-ded40eb
+stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739
+stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf
+stdlibCryptoVersion=2.7.3-20241113-081400-d015a39
+stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
+stdlibTaskVersion=2.5.1-20241113-123500-f905281
+stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa
+stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe
 
-observeVersion=1.3.1-20241007-161000-645452d
-observeInternalVersion=1.3.1-20241015-172900-cdc3cb3
+observeVersion=1.4.0-20241113-092000-b83ae74
+observeInternalVersion=1.3.1-20241113-101700-265054d
 
 ballerinaGradlePluginVersion=2.0.1
diff --git a/transaction-ballerina/Dependencies.toml b/transaction-ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.10.0-20241019-091600-89e54c08"
+distribution-version = "2201.11.0-20241112-214900-6b80ab87"
 
 [[package]]
 org = "ballerina"
@@ -26,7 +26,8 @@ version = "3.8.1"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "task"}
+	{org = "ballerina", name = "task"},
+	{org = "ballerina", name = "time"}
 ]
 modules = [
 	{org = "ballerina", packageName = "cache", moduleName = "cache"}
@@ -35,7 +36,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -49,6 +50,15 @@ dependencies = [
 	{org = "ballerina", name = "time"}
 ]
 
+[[package]]
+org = "ballerina"
+name = "data.jsondata"
+version = "0.3.0"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.object"}
+]
+
 [[package]]
 org = "ballerina"
 name = "file"
@@ -63,12 +73,13 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.1"
+version = "2.13.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"},
@@ -123,7 +134,8 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.int"},
 	{org = "ballerina", name = "lang.string"},
-	{org = "ballerina", name = "log"}
+	{org = "ballerina", name = "log"},
+	{org = "ballerina", name = "time"}
 ]
 
 [[package]]
@@ -246,7 +258,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "mime"
-version = "2.10.1"
+version = "2.10.2"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -263,13 +275,14 @@ dependencies = [
 	{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.3.1"
+version = "1.4.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -312,7 +325,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.5.1"
+version = "2.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]

diff --git a/transaction-ballerina/tests/transactional_expr.bal b/transaction-ballerina/tests/transactional_expr.bal
@@ -17,6 +17,7 @@
 import ballerina/test;
 
 @test:Config {
+    enable:false
 }
 function testTransactionalFalse() {
     test:assertEquals(false, transactional);
@@ -41,6 +42,7 @@ function testTransactionalFalse2() returns error? {
 }
 
 @test:Config {
+    enable:false
 }
 function testTransactionalFalse3() returns error? {
     transaction {

diff --git a/transaction-negative-tests/Ballerina.toml b/transaction-negative-tests/Ballerina.toml
@@ -1,26 +1,26 @@
 [package]
 org = "ballerinai"
 name = "transaction_negative_tests"
-version = "1.10.1"
+version = "@toml.version@"
 
 [platform.java21]
 graalvmCompatible = true
 
 [[platform.java21.dependency]]
-path = "../transaction-native/build/libs/transaction-native-1.10.1-SNAPSHOT.jar"
+path = "../transaction-native/build/libs/transaction-native-@project.version@.jar"
 groupId = "ballerina"
 artifactId = "transaction"
-version = "1.10.1-SNAPSHOT"
+version = "@project.version@"
 
 [[platform.java21.dependency]]
-path = "../transaction-test-utils/build/libs/transaction-test-utils-1.10.1-SNAPSHOT.jar"
+path = "../transaction-test-utils/build/libs/transaction-test-utils-@project.version@.jar"
 groupId = "org.ballerinalang.stdlib.transaction"
 scope = "testOnly"
 artifactId = "transaction"
-version = "1.10.1-SNAPSHOT"
+version = "@project.version@"
 
 [[platform.java21.dependency]]
-path = "./lib/io-native-1.6.2-20240928-084100-656404f.jar"
+path = "./lib/io-native-@io.native.version@.jar"
 groupId = "org.ballerinalang"
 artifactId = "io-native"
-version = "1.6.2-20240928-084100-656404f"
+version = "@io.native.version@"