From 682ae48361cc71e9f3cedb55d71f7870a0c3421f Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Tue, 9 Apr 2024 17:09:50 +0530 Subject: [PATCH 1/7] Bump versions --- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 5d453dff9..76c3f55c9 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -2,7 +2,7 @@ org = "ballerina" name = "grpc" version = "@toml.version@" -distribution = "2201.8.0" +distribution = "2201.9.0" authors = ["Ballerina"] keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"] repository = "https://github.com/ballerina-platform/module-ballerina-grpc" diff --git a/gradle.properties b/gradle.properties index 07561d9a1..30a411f98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.caching=true group=io.ballerina.stdlib -version=1.10.7-SNAPSHOT +version=1.11.0-SNAPSHOT #dependency versions -ballerinaLangVersion=2201.8.0 +ballerinaLangVersion=2201.9.0-20240405-165800-4b163f78 ballerinaTomlParserVersion=1.2.2 checkstylePluginVersion=10.12.0 commonsLang3Version=3.8.1 @@ -30,25 +30,25 @@ stdlibIoVersion=1.6.0 stdlibTimeVersion=2.4.0 stdlibUrlVersion=2.4.0 -stdlibConstraintVersion=1.4.0 -stdlibCryptoVersion=2.5.0 +stdlibConstraintVersion=1.5.0 +stdlibCryptoVersion=2.7.0-20240328-114200-c8cc19f stdlibLogVersion=2.9.0 stdlibOsVersion=1.8.0 stdlibProtobufVersion=1.6.0 stdlibRandomVersion=1.5.0 stdlibTaskVersion=2.5.0 -stdlibCacheVersion=3.7.0 +stdlibCacheVersion=3.8.0-20240409-101100-e2d7f4e stdlibFileVersion=1.9.0 stdlibMimeVersion=2.9.0 -stdlibUuidVersion=1.7.0 +stdlibUuidVersion=1.8.0-20240409-104400-2aaa58d -stdlibAuthVersion=2.10.0 -stdlibJwtVersion=2.10.0 -stdlibOAuth2Version=2.10.0 +stdlibAuthVersion=2.11.0-20240409-124200-655c2d4 +stdlibJwtVersion=2.11.0-20240409-134000-9b5bf2e +stdlibOAuth2Version=2.11.0-20240409-124200-15a9919 -stdlibHttpVersion=2.10.13-20240327-141300-ecd1355 +stdlibHttpVersion=2.11.0-20240409-155700-86d3a0d # Ballerinax Observer -observeVersion=1.2.0 -observeInternalVersion=1.2.0 +observeVersion=1.2.3-20240408-194900-a0e331f +observeInternalVersion=1.2.2-20240408-195500-1436319 From f00a182dc3c83ff1992b652da5beec586326137f Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Tue, 9 Apr 2024 17:11:00 +0530 Subject: [PATCH 2/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 24 ++++++++++++------------ ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 21 +++++++++++---------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 3b9792842..3b86b1b52 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,8 +1,8 @@ [package] org = "ballerina" name = "grpc" -version = "1.10.7" -distribution = "2201.8.0" +version = "1.11.0" +distribution = "2201.9.0" authors = ["Ballerina"] keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"] repository = "https://github.com/ballerina-platform/module-ballerina-grpc" @@ -16,15 +16,15 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "grpc-native" -version = "1.10.7" -path = "../native/build/libs/grpc-native-1.10.7-SNAPSHOT.jar" +version = "1.11.0" +path = "../native/build/libs/grpc-native-1.11.0-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/grpc-test-utils-1.10.7-SNAPSHOT.jar" +path = "../test-utils/build/libs/grpc-test-utils-1.11.0-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] -path = "./lib/ballerina-cli-2201.8.0.jar" +path = "./lib/ballerina-cli-2201.9.0-20240405-165800-4b163f78.jar" scope = "testOnly" [[platform.java17.dependency]] @@ -34,8 +34,8 @@ scope = "testOnly" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "http-native" -version = "2.10.13" -path = "./lib/http-native-2.10.13-20240327-141300-ecd1355.jar" +version = "2.11.0" +path = "./lib/http-native-2.11.0-20240409-155700-86d3a0d.jar" [[platform.java17.dependency]] groupId = "io.netty" @@ -157,11 +157,11 @@ path = "./lib/proto-google-common-protos-1.17.0.jar" [[platform.java17.dependency]] groupId = "org.ballerinalang" artifactId = "formatter-core" -version = "2201.8.0" -path = "./lib/formatter-core-2201.8.0.jar" +version = "2201.9.0-20240405-165800-4b163f78" +path = "./lib/formatter-core-2201.9.0-20240405-165800-4b163f78.jar" [[platform.java17.dependency]] groupId = "org.ballerinalang" artifactId = "ballerina-parser" -version = "2201.8.0" -path = "./lib/ballerina-parser-2201.8.0.jar" +version = "2201.9.0-20240405-165800-4b163f78" +path = "./lib/ballerina-parser-2201.9.0-20240405-165800-4b163f78.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index e31b5592b..28ec33c13 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "grpc-compiler-plugin" class = "io.ballerina.stdlib.grpc.plugin.GrpcCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.10.7-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.11.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 2a9794d7f..05c084e95 100644 --- 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.9.0-20240405-165800-4b163f78" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.11.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -25,7 +25,7 @@ modules = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -36,7 +36,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.4.0" +version = "1.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -44,7 +44,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.5.0" +version = "2.7.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -68,7 +68,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.10.7" +version = "1.11.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, @@ -94,7 +94,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.13" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -144,7 +144,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.11.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -273,7 +273,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.11.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -289,7 +289,7 @@ modules = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.2.3" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -338,6 +338,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ From c7d8231d654a779f619f7c3975c25cfe2c0c6792 Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Wed, 10 Apr 2024 09:32:36 +0530 Subject: [PATCH 3/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 3b86b1b52..964a893ae 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -106,14 +106,14 @@ path = "./lib/commons-pool-1.5.6.wso2v1.jar" [[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" -version = "1.74" -path = "./lib/bcprov-jdk18on-1.74.jar" +version = "1.77" +path = "./lib/bcprov-jdk18on-1.77.jar" [[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" -version = "1.74" -path = "./lib/bcpkix-jdk18on-1.74.jar" +version = "1.77" +path = "./lib/bcpkix-jdk18on-1.77.jar" [[platform.java17.dependency]] groupId = "io.netty" From 8b77d18a9d01dd391f81275ea3a572d370377386 Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Wed, 10 Apr 2024 09:34:40 +0530 Subject: [PATCH 4/7] Bump bouncycastle version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 30a411f98..61d830c76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ mockitoVersion=5.3.1 jacocoVersion=0.8.10 wso2OrbitAntlrVersion=4.5.1.wso2v1 ballerinaGradlePluginVersion=2.0.1 -bouncycastleVersion=1.74 +bouncycastleVersion=1.77 wso2CommonsPoolVersion=1.5.6.wso2v1 #stdlib dependencies From fc04bfec8094d712a0967b1670579a35149ce34c Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Wed, 10 Apr 2024 13:00:26 +0530 Subject: [PATCH 5/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 964a893ae..ec455862a 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -35,7 +35,7 @@ scope = "testOnly" groupId = "io.ballerina.stdlib" artifactId = "http-native" version = "2.11.0" -path = "./lib/http-native-2.11.0-20240409-155700-86d3a0d.jar" +path = "./lib/http-native-2.11.0-20240410-121300-ae1095d.jar" [[platform.java17.dependency]] groupId = "io.netty" @@ -106,14 +106,20 @@ path = "./lib/commons-pool-1.5.6.wso2v1.jar" [[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" -version = "1.77" -path = "./lib/bcprov-jdk18on-1.77.jar" +version = "1.78" +path = "./lib/bcprov-jdk18on-1.78.jar" [[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" -version = "1.77" -path = "./lib/bcpkix-jdk18on-1.77.jar" +version = "1.78" +path = "./lib/bcpkix-jdk18on-1.78.jar" + +[[platform.java17.dependency]] +groupId = "org.bouncycastle" +artifactId = "bcutil-jdk18on" +version = "@bouncycastle.version@" +path = "./lib/bcutil-jdk18on-@bouncycastle.version@.jar" [[platform.java17.dependency]] groupId = "io.netty" From ae79c32b803123b2cf311d086fbda0882f960e50 Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Wed, 10 Apr 2024 13:07:14 +0530 Subject: [PATCH 6/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index ec455862a..9aa304954 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -118,8 +118,8 @@ path = "./lib/bcpkix-jdk18on-1.78.jar" [[platform.java17.dependency]] groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" -version = "@bouncycastle.version@" -path = "./lib/bcutil-jdk18on-@bouncycastle.version@.jar" +version = "1.78" +path = "./lib/bcutil-jdk18on-1.78.jar" [[platform.java17.dependency]] groupId = "io.netty" From 32c54f4428b954afcd2328c6333f2b8ff060c176 Mon Sep 17 00:00:00 2001 From: dilanSachi Date: Wed, 10 Apr 2024 13:19:34 +0530 Subject: [PATCH 7/7] Bump bouncycastle version --- ballerina/build.gradle | 3 +++ build-config/resources/Ballerina.toml | 6 ++++++ gradle.properties | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 076dc7117..d0ec11b9d 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -117,6 +117,9 @@ dependencies { externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}") { transitive = false } + externalJars(group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: "${bouncycastleVersion}") { + transitive = false + } externalJars(group: 'io.netty', name: 'netty-tcnative-classes', version: "${nettyTcnativeVersion}") { transitive = false } diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 76c3f55c9..0ecf97694 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -115,6 +115,12 @@ artifactId = "bcpkix-jdk18on" version = "@bouncy.castle.version@" path = "./lib/bcpkix-jdk18on-@bouncy.castle.version@.jar" +[[platform.java17.dependency]] +groupId = "org.bouncycastle" +artifactId = "bcutil-jdk18on" +version = "@bouncy.castle.version@" +path = "./lib/bcutil-jdk18on-@bouncy.castle.version@.jar" + [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-tcnative-classes" diff --git a/gradle.properties b/gradle.properties index 61d830c76..bf1843532 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ mockitoVersion=5.3.1 jacocoVersion=0.8.10 wso2OrbitAntlrVersion=4.5.1.wso2v1 ballerinaGradlePluginVersion=2.0.1 -bouncycastleVersion=1.77 +bouncycastleVersion=1.78 wso2CommonsPoolVersion=1.5.6.wso2v1 #stdlib dependencies @@ -47,7 +47,7 @@ stdlibAuthVersion=2.11.0-20240409-124200-655c2d4 stdlibJwtVersion=2.11.0-20240409-134000-9b5bf2e stdlibOAuth2Version=2.11.0-20240409-124200-15a9919 -stdlibHttpVersion=2.11.0-20240409-155700-86d3a0d +stdlibHttpVersion=2.11.0-20240410-121300-ae1095d # Ballerinax Observer observeVersion=1.2.3-20240408-194900-a0e331f