Migrate to Java 21

ballerina-platform · Oct 7, 2024 · 72d8bb1 · 72d8bb1
1 parent 71f3257
commit 72d8bb1
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 28 deletions.
diff --git a/.github/workflows/build-dependent-std-libs.yml b/.github/workflows/build-dependent-std-libs.yml
@@ -26,11 +26,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
 
             - name: Checkout module
               uses: actions/checkout@v3

diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -13,5 +13,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
@@ -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
@@ -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/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: mime

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -6,5 +6,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/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
@@ -40,7 +40,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/Ballerina.toml b/ballerina/Ballerina.toml
@@ -9,26 +9,26 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "mime-native"
 version = "2.10.0"
 path = "../native/build/libs/mime-native-2.10.0.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../test-utils/build/libs/mime-test-utils-2.10.0.jar"
 scope = "testOnly"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/mimepull-1.9.11.jar"
 groupId = "org.jvnet.mimepull"
 artifactId = "mimepull"
 version = "1.9.11"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/jakarta.activation-api-2.0.1.jar"
 groupId = "jakarta.activation"
 artifactId = "jakarta.activation-api"

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -9,26 +9,26 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "mime-native"
 version = "@toml.version@"
 path = "../native/build/libs/mime-native-@project.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../test-utils/build/libs/mime-test-utils-@project.version@.jar"
 scope = "testOnly"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/mimepull-@mimepull.version@.jar"
 groupId = "org.jvnet.mimepull"
 artifactId = "mimepull"
 version = "@mimepull.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/jakarta.activation-api-@jakarta.activation.version@.jar"
 groupId = "jakarta.activation"
 artifactId = "jakarta.activation-api"

diff --git a/build.gradle b/build.gradle
@@ -16,10 +16,10 @@
  */
 
 plugins {
-    id "com.github.spotbugs" version "5.0.14"
-    id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "de.undercouch.download" version "5.4.0"
-    id "net.researchgate.release" version "2.8.0"
+    id "com.github.spotbugs" version "${githubSpotbugsVersion}"
+    id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}"
+    id "de.undercouch.download" version "${underCouchDownloadVersion}"
+    id "net.researchgate.release" version "${researchgateReleaseVersion}"
 }
 
 ext.ballerinaLangVersion = project.ballerinaLangVersion

diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,19 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=2.10.1-SNAPSHOT
-ballerinaLangVersion=2201.10.0
+ballerinaLangVersion=2201.10.0-20241007-143200-6b69ca80
 
 mimepullVersion=1.9.11
 puppycrawlCheckstyleVersion=10.12.0
+githubJohnrengelmanShadowVersion=8.1.1
+checkstyleToolVersion=10.12.0
+githubSpotbugsVersion=6.0.18
 jakartaActivationVersion=2.0.1
 testngVersion=7.6.1
 ballerinaGradlePluginVersion=2.2.3
 mockitoVersion=5.3.1
 
-stdlibIoVersion=1.6.0
-stdlibLogVersion=2.10.0
-observeVersion=1.3.0
-observeInternalVersion=1.3.0
+stdlibIoVersion=1.6.2-20240928-084100-656404f
+stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4
+observeVersion=1.3.1-20241007-161000-645452d
+observeInternalVersion=1.3.1-20241007-182700-a5f77a1