Merge pull request #245 from ravinperera00/java21

Migrate to Java 21 and bump minor version
ballerina-platform · Jan 30, 2025 · 337f617 · 337f617
2 parents 7e10b50 + b2d3439
commit 337f617
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 60 deletions.
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -21,14 +21,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set Up Ballerina
-        uses: ballerina-platform/setup-ballerina@v1.1.0
+        uses: ballerina-platform/setup-ballerina@v1.1.3
         with:
-          version: latest
+          version: nightly
 
       - name: Set up GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: "17"
+          java-version: "21"
           distribution: "graalvm-community"
           set-java-home: true
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -127,7 +127,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/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,107 +1,107 @@
 [package]
-distribution = "2201.7.0"
+distribution = "2201.11.0-20241218-101200-109f6cc7"
 org="ballerinax"
 name = "redis"
-version = "3.0.3"
+version = "3.1.0"
 authors = ["Ballerina"]
 keywords = ["IT Operations/Databases",  "Cost/Freemium"]
 icon = "icon.png"
 repository = "https://github.com/ballerina-platform/module-ballerinax-redis"
 license = ["Apache-2.0"]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "redis-native"
 module = "redis-native"
-version="3.0.3-SNAPSHOT"
-path = "../native/build/libs/redis-native-3.0.3-SNAPSHOT.jar"
+version="3.1.0-SNAPSHOT"
+path = "../native/build/libs/redis-native-3.1.0-SNAPSHOT.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.lettuce"
 artifactId = "lettuce-core"
 version = "6.3.1.RELEASE"
 
-[[platform.java11.dependency]]
+[[platform.java21.dependency]]
 groupId = "org.apache.commons"
 artifactId = "commons-pool2"
 version = "2.11.1"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "com.google.guava"
 artifactId = "guava"
 version = "32.0.0-jre"
 path = "./lib/guava-32.0.0-jre.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "commons-io"
 artifactId = "commons-io"
 version = "2.7"
 path = "./lib/commons-io-2.7.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-common"
 version = "4.1.104.Final"
 path = "./lib/netty-common-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-buffer"
 version = "4.1.104.Final"
 path = "./lib/netty-buffer-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport"
 version = "4.1.104.Final"
 path = "./lib/netty-transport-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-resolver"
 version = "4.1.104.Final"
 path = "./lib/netty-resolver-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-handler"
 version = "4.1.104.Final"
 path = "./lib/netty-handler-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-kqueue"
 version = "4.1.104.Final"
 path = "./lib/netty-transport-native-kqueue-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-epoll"
 version = "4.1.104.Final"
 path = "./lib/netty-transport-native-epoll-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec"
 version = "4.1.104.Final"
 path = "./lib/netty-codec-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-unix-common"
 version = "4.1.104.Final"
 path = "./lib/netty-transport-native-unix-common-4.1.104.Final.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.projectreactor"
 artifactId = "reactor-core"
 version = "3.6.2"
 path = "./lib/reactor-core-3.6.2.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "org.reactivestreams"
 artifactId = "reactive-streams"
 version = "1.0.2"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.0"
+distribution-version = "2201.11.0-20241218-101200-109f6cc7"
 
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.6.2"
+version = "2.8.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
@@ -22,7 +22,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.0"
+version = "1.7.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -70,7 +70,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.9.0"
+version = "2.11.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -85,7 +85,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.2.3"
+version = "1.4.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
@@ -94,7 +94,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "os"
-version = "1.8.0"
+version = "1.9.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "io"},
@@ -120,15 +120,15 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.4.0"
+version = "2.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerinax"
 name = "redis"
-version = "3.0.3"
+version = "3.1.0"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -49,7 +49,7 @@ ballerina {
     module = packageName
     testCoverageParam = "--code-coverage --coverage-format=xml"
     isConnector = true
-    platform = "java17"
+    platform = "java21"
 }
 
 configurations {

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -9,99 +9,99 @@ icon = "icon.png"
 repository = "https://github.com/ballerina-platform/module-ballerinax-redis"
 license = ["Apache-2.0"]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "redis-native"
 module = "redis-native"
 version="@project.version@"
 path = "../native/build/libs/redis-native-@project.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.lettuce"
 artifactId = "lettuce-core"
 version = "@lettuce.version@"
 
-[[platform.java11.dependency]]
+[[platform.java21.dependency]]
 groupId = "org.apache.commons"
 artifactId = "commons-pool2"
 version = "@commons.pool2.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "com.google.guava"
 artifactId = "guava"
 version = "@guava.version@"
 path = "./lib/guava-@guava.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "commons-io"
 artifactId = "commons-io"
 version = "@commons.io.version@"
 path = "./lib/commons-io-@commons.io.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-common"
 version = "@netty.version@"
 path = "./lib/netty-common-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-buffer"
 version = "@netty.version@"
 path = "./lib/netty-buffer-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport"
 version = "@netty.version@"
 path = "./lib/netty-transport-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-resolver"
 version = "@netty.version@"
 path = "./lib/netty-resolver-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-handler"
 version = "@netty.version@"
 path = "./lib/netty-handler-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-kqueue"
 version = "@netty.version@"
 path = "./lib/netty-transport-native-kqueue-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-epoll"
 version = "@netty.version@"
 path = "./lib/netty-transport-native-epoll-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-codec"
 version = "@netty.version@"
 path = "./lib/netty-codec-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.netty"
 artifactId = "netty-transport-native-unix-common"
 version = "@netty.version@"
 path = "./lib/netty-transport-native-unix-common-@netty.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.projectreactor"
 artifactId = "reactor-core"
 version = "@reactor-core.version@"
 path = "./lib/reactor-core-@reactor-core.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "org.reactivestreams"
 artifactId = "reactive-streams"
 version = "@reactive-streams.version@"

diff --git a/examples/cache-management/Ballerina.toml b/examples/cache-management/Ballerina.toml
@@ -2,7 +2,7 @@
 org = "nino"
 name = "cache_management"
 version = "0.1.0"
-distribution = "2201.8.3"
+distribution = "2201.11.0-20241218-101200-109f6cc7"
 
 [build-options]
 observabilityIncluded = true
diff --git a/examples/rate-limiting/Ballerina.toml b/examples/rate-limiting/Ballerina.toml
@@ -2,7 +2,7 @@
 org = "nino"
 name = "rate_limiting"
 version = "0.1.0"
-distribution = "2201.8.3"
+distribution = "2201.11.0-20241218-101200-109f6cc7"
 
 [build-options]
 observabilityIncluded = true
diff --git a/examples/session-management/Ballerina.toml b/examples/session-management/Ballerina.toml
@@ -2,7 +2,7 @@
 org = "nino"
 name = "session_management"
 version = "0.1.0"
-distribution = "2201.8.3"
+distribution = "2201.11.0-20241218-101200-109f6cc7"
 
 [build-options]
 observabilityIncluded = true
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.caching=true
 group=io.ballerina.lib.redis
-version=3.0.3-SNAPSHOT
-ballerinaLangVersion=2201.8.0
+version=3.1.0-SNAPSHOT
+ballerinaLangVersion=2201.11.0-20241218-101200-109f6cc7
 
 checkstylePluginVersion=10.12.1
-spotbugsPluginVersion=5.0.14
+spotbugsPluginVersion=6.0.18
 shadowJarPluginVersion=8.1.1
 downloadPluginVersion=5.4.0
 releasePluginVersion=2.8.0