Merge pull request #2218 from warunalakshitha/syncJava21

Migrate to Java 21
ballerina-platform · Nov 19, 2024 · 87979eb · 87979eb
2 parents 3d0d25f + 47ec837
commit 87979eb
Show file tree

Hide file tree

Showing 116 changed files with 935 additions and 1,255 deletions.
diff --git a/.github/workflows/build-dependent-std-libs.yml b/.github/workflows/build-dependent-std-libs.yml
@@ -30,11 +30,11 @@ jobs:
             matrix:
                 module: ${{ fromJson(inputs.ballerina_modules) }}
         steps:
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: 17.0.7
+                  java-version: 21.0.3
 
             - name: Checkout module
               uses: actions/checkout@v3
@@ -98,11 +98,11 @@ jobs:
             matrix:
                 module: ${{ fromJson(inputs.ballerinax_modules) }}
         steps:
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: 17.0.7
+                  java-version: 21.0.3
 
             - name: Checkout module
               uses: actions/checkout@v3

diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -6,9 +6,9 @@ on:
             lang_tag:
                 description: Branch/Release Tag of the Ballerina Lang
                 required: true
-                default: master
+                default: java21
             lang_version:
-                description: Ballerina Lang Version (If given ballerina lang buid will be skipped)
+                description: Ballerina Lang Version (If given ballerina lang build will be skipped)
                 required: false
                 default: ''
             native_image_options:
@@ -46,7 +46,5 @@ jobs:
             lang_version: ${{ inputs.lang_version }}
             native_image_options: '-J-Xmx7G ${{ inputs.native_image_options }}'
             additional_ubuntu_build_flags: '-x :http-native:test -x :http-compiler-plugin-tests:test ${{ inputs.build_properties }}'
-            # additional_windows_build_flags: '-x :http-native:test -x :http-compiler-plugin-tests:test ${{ inputs.build_properties }}'
-            # TODO : Enable after fixing this issue : https://github.com/ballerina-platform/ballerina-lang/issues/38882
-            additional_windows_build_flags: '-x test'
+            additional_windows_build_flags: '-x :http-native:test -x :http-compiler-plugin-tests:test ${{ inputs.build_properties }}'
             java_tool_options: '-Dfile.encoding=UTF8'
diff --git a/.github/workflows/build-with-ballerina-lang.yml b/.github/workflows/build-with-ballerina-lang.yml
@@ -8,7 +8,7 @@ on:
                 required: false
                 default: master
             lang_version:
-                description: Ballerina Lang Version (If given ballerina lang buid will be skipped)
+                description: Ballerina Lang Version (If given ballerina lang build will be skipped)
                 required: false
                 default: ''
             build_properties:
@@ -30,11 +30,11 @@ jobs:
                   repository: 'ballerina-platform/ballerina-lang'
                   ref: ${{ inputs.lang_tag || 'master' }}
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v3
               with:
                 distribution: 'temurin'
-                java-version: 17.0.7
+                java-version: 21.0.3
 
             - name: Set Ballerina Lang version
               run: |
@@ -77,11 +77,11 @@ jobs:
                   repository: 'ballerina-platform/ballerina-lang'
                   ref: ${{ inputs.lang_tag || 'master' }}
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v3
               with:
                 distribution: 'temurin'
-                java-version: 17.0.7
+                java-version: 21.0.3
 
             - name: Set Ballerina Lang version
               run: |

diff --git a/README.md b/README.md
@@ -117,7 +117,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/)
 

diff --git a/ballerina-tests/http-advanced-tests/Ballerina.toml b/ballerina-tests/http-advanced-tests/Ballerina.toml
@@ -9,9 +9,9 @@ name = "http_test_common"
 repository = "local"
 version = "2.13.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 scope = "testOnly"
 path = "../../test-utils/build/libs/http-test-utils-2.13.0-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-advanced-tests/Dependencies.toml b/ballerina-tests/http-advanced-tests/Dependencies.toml
@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.11.0-20241008-112400-81975006"
+distribution-version = "2201.10.0-20241011-161100-51978649"
 
 [[package]]
 org = "ballerina"
 name = "auth"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -23,19 +23,18 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.8.0"
+version = "3.8.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "task"},
-	{org = "ballerina", name = "time"}
+	{org = "ballerina", name = "task"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.5.0"
+version = "1.5.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -44,7 +43,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.7.2"
+version = "2.7.3"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -54,20 +53,10 @@ modules = [
 	{org = "ballerina", packageName = "crypto", moduleName = "crypto"}
 ]
 
-[[package]]
-org = "ballerina"
-name = "data.jsondata"
-version = "0.3.0"
-scope = "testOnly"
-dependencies = [
-	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "lang.object"}
-]
-
 [[package]]
 org = "ballerina"
 name = "file"
-version = "1.10.0"
+version = "1.10.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -89,7 +78,6 @@ dependencies = [
 	{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"},
@@ -154,7 +142,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.1"
+version = "1.6.2"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -173,7 +161,7 @@ scope = "testOnly"
 [[package]]
 org = "ballerina"
 name = "jwt"
-version = "2.13.0"
+version = "2.13.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "cache"},
@@ -182,8 +170,7 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.int"},
 	{org = "ballerina", name = "lang.string"},
-	{org = "ballerina", name = "log"},
-	{org = "ballerina", name = "time"}
+	{org = "ballerina", name = "log"}
 ]
 
 [[package]]
@@ -287,7 +274,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.10.0"
+version = "2.10.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -314,21 +301,20 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "oauth2"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 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.3.0"
+version = "1.3.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -337,7 +323,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "os"
-version = "1.8.0"
+version = "1.8.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -347,7 +333,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "task"
-version = "2.5.0"
+version = "2.5.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -371,7 +357,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.5.0"
+version = "2.5.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -383,7 +369,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}

diff --git a/ballerina-tests/http-client-tests/Ballerina.toml b/ballerina-tests/http-client-tests/Ballerina.toml
@@ -9,9 +9,9 @@ name = "http_test_common"
 repository = "local"
 version = "2.13.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 scope = "testOnly"
 path = "../../test-utils/build/libs/http-test-utils-2.13.0-SNAPSHOT.jar"