Skip to content

Commit

Permalink
Merge pull request #1658 from warunalakshitha/syncJava21
Browse files Browse the repository at this point in the history
Migrate to Java 21
  • Loading branch information
warunalakshitha authored Nov 19, 2024
2 parents 47ed372 + 1e520b6 commit 6ee5cba
Show file tree
Hide file tree
Showing 26 changed files with 340 additions and 332 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ This repository only contains the source code for the module.

### Set Up the prerequisites

* Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
* Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).

* [Oracle](https://www.oracle.com/java/technologies/downloads/)

Expand Down
12 changes: 6 additions & 6 deletions ballerina-tests/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ org = "ballerina"
name = "grpc_tests"
version = "@toml.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "grpc-native"
version = "@project.version@"
path = "../native/build/libs/grpc-native-@project.version@.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "../test-utils/build/libs/grpc-test-utils-@project.version@.jar"
scope = "testOnly"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/ballerina-cli-@ballerinalang.version@.jar"
scope = "testOnly"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "com.google.protobuf"
artifactId = "protobuf-java"
version = "@protobuf.java.version@"
path = "./lib/protobuf-java-@protobuf.java.version@.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "com.google.api.grpc"
artifactId = "proto-google-common-protos"
version = "@proto.google.commons.version@"
path = "./lib/proto-google-common-protos-@proto.google.commons.version@.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.ballerinalang"
artifactId = "formatter-core"
version = "@ballerinalang.version@"
Expand Down
70 changes: 35 additions & 35 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,164 +10,164 @@ icon = "icon.png"
license = ["Apache-2.0"]
export = ["grpc", "grpc.types.duration", "grpc.types.struct", "grpc.types.timestamp", "grpc.types.wrappers", "grpc.types.any"]

[platform.java17]
[platform.java21]
graalvmCompatible = true

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "grpc-native"
version = "1.13.0"
path = "../native/build/libs/grpc-native-1.13.0-SNAPSHOT.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "../test-utils/build/libs/grpc-test-utils-1.13.0-SNAPSHOT.jar"
scope = "testOnly"

[[platform.java17.dependency]]
path = "./lib/ballerina-cli-2201.11.0-20241008-112400-81975006.jar"
[[platform.java21.dependency]]
path = "./lib/ballerina-cli-2201.10.0-20241025-103700-5c9e6a27.jar"
scope = "testOnly"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/antlr4-runtime-4.5.1.wso2v1.jar"
scope = "testOnly"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.13.0"
path = "./lib/http-native-2.13.0-20241113-151000-3feb04b.jar"
path = "./lib/http-native-2.13.0-20241029-110700-30ed05b.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-common"
version = "4.1.115.Final"
path = "./lib/netty-common-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-buffer"
version = "4.1.115.Final"
path = "./lib/netty-buffer-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-transport"
version = "4.1.115.Final"
path = "./lib/netty-transport-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-resolver"
version = "4.1.115.Final"
path = "./lib/netty-resolver-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-handler"
version = "4.1.115.Final"
path = "./lib/netty-handler-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-http"
version = "4.1.115.Final"
path = "./lib/netty-codec-http-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-codec"
version = "4.1.115.Final"
path = "./lib/netty-codec-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-handler-proxy"
version = "4.1.115.Final"
path = "./lib/netty-handler-proxy-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-http2"
version = "4.1.115.Final"
path = "./lib/netty-codec-http2-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-transport-native-unix-common"
version = "4.1.115.Final"
path = "./lib/netty-transport-native-unix-common-4.1.115.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "commons.pool.wso2"
artifactId = "commons-pool"
version = "1.5.6.wso2v1"
path = "./lib/commons-pool-1.5.6.wso2v1.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcprov-jdk18on"
version = "1.78"
path = "./lib/bcprov-jdk18on-1.78.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk18on"
version = "1.78"
path = "./lib/bcpkix-jdk18on-1.78.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcutil-jdk18on"
version = "1.78"
path = "./lib/bcutil-jdk18on-1.78.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-tcnative-classes"
version = "2.0.65.Final"
path = "./lib/netty-tcnative-classes-2.0.65.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-tcnative-boringssl-static"
version = "2.0.65.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "com.google.protobuf"
artifactId = "protobuf-java"
version = "3.25.5"
path = "./lib/protobuf-java-3.25.5.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "com.google.api.grpc"
artifactId = "proto-google-common-protos"
version = "1.17.0"
path = "./lib/proto-google-common-protos-1.17.0.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.ballerinalang"
artifactId = "formatter-core"
version = "2201.11.0-20241008-112400-81975006"
path = "./lib/formatter-core-2201.11.0-20241008-112400-81975006.jar"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
groupId = "org.ballerinalang"
artifactId = "ballerina-parser"
version = "2201.11.0-20241008-112400-81975006"
path = "./lib/ballerina-parser-2201.11.0-20241008-112400-81975006.jar"
version = "2201.10.0-20241025-103700-5c9e6a27"
path = "./lib/ballerina-parser-2201.10.0-20241025-103700-5c9e6a27.jar"
Loading

0 comments on commit 6ee5cba

Please sign in to comment.