Migrate to Java 21

ballerina-platform · Sep 30, 2024 · a938cf2 · a938cf2
1 parent 2b565f4
commit a938cf2
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -15,5 +15,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: avro

diff --git 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/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
@@ -62,7 +62,7 @@ This repository only contains the source code for the package.
 
 ### Prerequisites
 
-1. Download and install Java SE Development Kit (JDK) version 17. You can download it from either of the following sources:
+1. Download and install Java SE Development Kit (JDK) version 21. You can download it from either of the following sources:
 
    - [Oracle JDK](https://www.oracle.com/java/technologies/downloads/)
    - [OpenJDK](https://adoptium.net/)

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -12,22 +12,22 @@ distribution = "2201.8.0"
 [build-options]
 observabilityIncluded = true
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "avro-native"
 version = "@toml.version@"
 path = "../native/build/libs/[email protected]@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "org.apache.avro"
 artifactId = "avro"
 version = "@avro.version@"
 path = "./lib/[email protected]@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "com.fasterxml.jackson.core"
 artifactId = "jackson-core"
 version = "@jackson.version@"

diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.caching=true
 group=io.ballerina.lib
 version=1.0.1-SNAPSHOT
-ballerinaLangVersion=2201.9.0
+ballerinaLangVersion=2201.10.0-20240926-231800-8a5a4343
 
 checkstylePluginVersion=10.12.0
-spotbugsPluginVersion=5.0.14
+spotbugsPluginVersion=6.0.18
 githubShadowVersion=7.1.2
 checkstyleToolVersion=7.8.2
 shadowJarPluginVersion=8.1.1
@@ -13,6 +13,6 @@ releasePluginVersion=2.8.0
 ballerinaGradlePluginVersion=2.0.1
 
 # Dependencies
-stdlibIoVersion=1.6.0
+stdlibIoVersion=1.6.2-20240928-084100-656404f
 avroVersion=1.11.3
 jacksonVersion=2.17.0
diff --git a/native/build.gradle b/native/build.gradle
@@ -56,8 +56,11 @@ compileJava {
 }
 
 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