Merge pull request #1201 from HindujaB/java21

Migrate to Java 21
ballerina-platform · Nov 18, 2024 · d8c18ce · d8c18ce
2 parents 81e59d8 + 28b2674
commit d8c18ce
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,16 +1,16 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=3.8.1-SNAPSHOT
-ballerinaLangVersion=2201.8.0
-stdlibTaskVersion=2.5.0
-stdlibTimeVersion=2.4.0
-stdlibConstraintVersion=1.5.0
+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
 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
@@ -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