From e8eaf0acf183bc536def1b713a69a6fa99af903f Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Fri, 2 Aug 2024 22:50:40 +0530 Subject: [PATCH 1/7] Update docker command to docker compose v2 --- ballerina-tests/build.gradle | 2 +- ballerina/build.gradle | 2 +- .../resources/openldap/{docker-compose.yml => compose.yml} | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename ballerina/tests/resources/openldap/{docker-compose.yml => compose.yml} (96%) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index e5b52eb90..09c8ca060 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -207,7 +207,7 @@ task stopLdapServer() { if (stdOut.toString().contains("openldap-server")) { println "Stopping LDAP server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/resources/openldap/docker-compose.yml rm -svf" + commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml rm -svf" standardOutput = stdOut } println stdOut.toString() diff --git a/ballerina/build.gradle b/ballerina/build.gradle index d0ec11b9d..cfde948a1 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -236,7 +236,7 @@ task startLdapServer() { if (!stdOut.toString().contains("openldap-server")) { println "Starting LDAP server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/resources/openldap/docker-compose.yml up -d" + commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml up -d" standardOutput = stdOut } println stdOut.toString() diff --git a/ballerina/tests/resources/openldap/docker-compose.yml b/ballerina/tests/resources/openldap/compose.yml similarity index 96% rename from ballerina/tests/resources/openldap/docker-compose.yml rename to ballerina/tests/resources/openldap/compose.yml index 6c4d9869b..e46069f79 100644 --- a/ballerina/tests/resources/openldap/docker-compose.yml +++ b/ballerina/tests/resources/openldap/compose.yml @@ -1,4 +1,3 @@ -version: '3.7' services: ldap_server: image: osixia/openldap:1.3.0 From ad5a1350f478edb7a07b3b81cd87be47a8f2b16f Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Fri, 2 Aug 2024 22:52:59 +0530 Subject: [PATCH 2/7] [Automated] Update the native jar versions --- .../openldap/{docker-compose.yml => compose.yml} | 1 - ballerina/Ballerina.toml | 8 ++++---- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename ballerina-tests/tests/resources/openldap/{docker-compose.yml => compose.yml} (96%) diff --git a/ballerina-tests/tests/resources/openldap/docker-compose.yml b/ballerina-tests/tests/resources/openldap/compose.yml similarity index 96% rename from ballerina-tests/tests/resources/openldap/docker-compose.yml rename to ballerina-tests/tests/resources/openldap/compose.yml index 6c4d9869b..e46069f79 100644 --- a/ballerina-tests/tests/resources/openldap/docker-compose.yml +++ b/ballerina-tests/tests/resources/openldap/compose.yml @@ -1,4 +1,3 @@ -version: '3.7' services: ldap_server: image: osixia/openldap:1.3.0 diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 4aeaee0f8..e3da380da 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "grpc" -version = "1.11.1" +version = "1.11.2" distribution = "2201.9.0" authors = ["Ballerina"] keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"] @@ -16,11 +16,11 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "grpc-native" -version = "1.11.1" -path = "../native/build/libs/grpc-native-1.11.1.jar" +version = "1.11.2" +path = "../native/build/libs/grpc-native-1.11.2-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/grpc-test-utils-1.11.1.jar" +path = "../test-utils/build/libs/grpc-test-utils-1.11.2-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 98840852b..f4e07bf97 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.11.1.jar" +path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.11.2-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 433359e5b..ab95b0c70 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -68,7 +68,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.11.1" +version = "1.11.2" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, From 2fc11665fc2849512c1c9db27d26302296112d6b Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 8 Aug 2024 07:30:54 +0530 Subject: [PATCH 3/7] Update lang and dependency 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 0ecf97694..c11629927 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.9.0" +distribution = "2201.10.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 2a209c824..98d7745ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.caching=true group=io.ballerina.stdlib -version=1.11.2-SNAPSHOT +version=1.12.0-SNAPSHOT #dependency versions -ballerinaLangVersion=2201.9.0 +ballerinaLangVersion=2201.10.0-20240806-083400-aabac46a ballerinaTomlParserVersion=1.2.2 checkstylePluginVersion=10.12.0 commonsLang3Version=3.8.1 @@ -31,24 +31,24 @@ stdlibTimeVersion=2.4.0 stdlibUrlVersion=2.4.0 stdlibConstraintVersion=1.5.0 -stdlibCryptoVersion=2.7.0 -stdlibLogVersion=2.9.0 +stdlibCryptoVersion=2.7.2 +stdlibLogVersion=2.10.0-20240807-203000-b85cfb9 stdlibOsVersion=1.8.0 stdlibProtobufVersion=1.6.0 stdlibRandomVersion=1.5.0 stdlibTaskVersion=2.5.0 stdlibCacheVersion=3.8.0 -stdlibFileVersion=1.9.0 -stdlibMimeVersion=2.9.0 +stdlibFileVersion=1.10.0-20240807-205900-a4d66bb +stdlibMimeVersion=2.10.0-20240807-205100-2728cdc stdlibUuidVersion=1.8.0 -stdlibAuthVersion=2.11.0 -stdlibJwtVersion=2.11.0 -stdlibOAuth2Version=2.11.0 +stdlibAuthVersion=2.12.0-20240807-214700-37b31bb +stdlibJwtVersion=3.0.0-20240807-214800-ea931f0 +stdlibOAuth2Version=2.12.0-20240807-220200-7f7294b -stdlibHttpVersion=2.11.0 +stdlibHttpVersion=2.12.0-20240808-064600-7e5bc3c # Ballerinax Observer -observeVersion=1.2.3 -observeInternalVersion=1.2.2 +observeVersion=1.3.0-20240807-093200-e29ca7a +observeInternalVersion=1.3.0-20240807-094500-91e2d3a From 2e090e761fbb603a366ef937f7cf808783265a82 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 8 Aug 2024 07:32:50 +0530 Subject: [PATCH 4/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 24 ++++++++++++------------ ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 24 +++++++++++++----------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e3da380da..b1978dfea 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,8 +1,8 @@ [package] org = "ballerina" name = "grpc" -version = "1.11.2" -distribution = "2201.9.0" +version = "1.12.0" +distribution = "2201.10.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.11.2" -path = "../native/build/libs/grpc-native-1.11.2-SNAPSHOT.jar" +version = "1.12.0" +path = "../native/build/libs/grpc-native-1.12.0-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/grpc-test-utils-1.11.2-SNAPSHOT.jar" +path = "../test-utils/build/libs/grpc-test-utils-1.12.0-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] -path = "./lib/ballerina-cli-2201.9.0.jar" +path = "./lib/ballerina-cli-2201.10.0-20240806-083400-aabac46a.jar" scope = "testOnly" [[platform.java17.dependency]] @@ -34,8 +34,8 @@ scope = "testOnly" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "http-native" -version = "2.11.0" -path = "./lib/http-native-2.11.0.jar" +version = "2.12.0" +path = "./lib/http-native-2.12.0-20240808-064600-7e5bc3c.jar" [[platform.java17.dependency]] groupId = "io.netty" @@ -163,11 +163,11 @@ path = "./lib/proto-google-common-protos-1.17.0.jar" [[platform.java17.dependency]] groupId = "org.ballerinalang" artifactId = "formatter-core" -version = "2201.9.0" -path = "./lib/formatter-core-2201.9.0.jar" +version = "2201.10.0-20240806-083400-aabac46a" +path = "./lib/formatter-core-2201.10.0-20240806-083400-aabac46a.jar" [[platform.java17.dependency]] groupId = "org.ballerinalang" artifactId = "ballerina-parser" -version = "2201.9.0" -path = "./lib/ballerina-parser-2201.9.0.jar" +version = "2201.10.0-20240806-083400-aabac46a" +path = "./lib/ballerina-parser-2201.10.0-20240806-083400-aabac46a.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index f4e07bf97..2027a88b1 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.11.2-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.12.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index ab95b0c70..37191206e 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.9.0" +distribution-version = "2201.10.0-20240806-083400-aabac46a" [[package]] org = "ballerina" name = "auth" -version = "2.11.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -56,7 +56,7 @@ modules = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -68,7 +68,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.11.2" +version = "1.12.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, @@ -94,7 +94,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.11.0" +version = "2.12.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -144,10 +144,11 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.11.0" +version = "3.0.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -248,7 +249,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -262,18 +263,19 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.11.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -289,7 +291,7 @@ modules = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From 04e63288d3ea501bddc4187a9e231388ff21cf77 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Fri, 9 Aug 2024 12:13:22 +0530 Subject: [PATCH 5/7] Update dependency versions --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 98d7745ff..3e2be7bbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ bouncycastleVersion=1.78 wso2CommonsPoolVersion=1.5.6.wso2v1 #stdlib dependencies -stdlibIoVersion=1.6.0 +stdlibIoVersion=1.6.1 stdlibTimeVersion=2.4.0 stdlibUrlVersion=2.4.0 @@ -44,10 +44,10 @@ stdlibMimeVersion=2.10.0-20240807-205100-2728cdc stdlibUuidVersion=1.8.0 stdlibAuthVersion=2.12.0-20240807-214700-37b31bb -stdlibJwtVersion=3.0.0-20240807-214800-ea931f0 +stdlibJwtVersion=2.13.0-20240809-095500-b9d03ed stdlibOAuth2Version=2.12.0-20240807-220200-7f7294b -stdlibHttpVersion=2.12.0-20240808-064600-7e5bc3c +stdlibHttpVersion=2.12.0-20240809-111500-91b1ccd # Ballerinax Observer observeVersion=1.3.0-20240807-093200-e29ca7a From e37aa916aeb584f85815fb4a972b22b307083c6f Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Fri, 9 Aug 2024 12:17:49 +0530 Subject: [PATCH 6/7] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 2 +- ballerina/Dependencies.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index b1978dfea..913dc332b 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -35,7 +35,7 @@ scope = "testOnly" groupId = "io.ballerina.stdlib" artifactId = "http-native" version = "2.12.0" -path = "./lib/http-native-2.12.0-20240808-064600-7e5bc3c.jar" +path = "./lib/http-native-2.12.0-20240809-111500-91b1ccd.jar" [[platform.java17.dependency]] groupId = "io.netty" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 37191206e..23fb55374 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -127,7 +127,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -144,7 +144,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "3.0.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, From 3298f40b996546222057069728ecdf5c62f13354 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Wed, 14 Aug 2024 15:42:08 +0530 Subject: [PATCH 7/7] [Automated] Update dependencies --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3e2be7bbb..dc311c53f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.12.0-SNAPSHOT #dependency versions -ballerinaLangVersion=2201.10.0-20240806-083400-aabac46a +ballerinaLangVersion=2201.10.0-20240814-095500-9d14866a ballerinaTomlParserVersion=1.2.2 checkstylePluginVersion=10.12.0 commonsLang3Version=3.8.1 @@ -32,23 +32,23 @@ stdlibUrlVersion=2.4.0 stdlibConstraintVersion=1.5.0 stdlibCryptoVersion=2.7.2 -stdlibLogVersion=2.10.0-20240807-203000-b85cfb9 +stdlibLogVersion=2.10.0-20240814-120000-f0c3cc8 stdlibOsVersion=1.8.0 stdlibProtobufVersion=1.6.0 stdlibRandomVersion=1.5.0 stdlibTaskVersion=2.5.0 stdlibCacheVersion=3.8.0 -stdlibFileVersion=1.10.0-20240807-205900-a4d66bb -stdlibMimeVersion=2.10.0-20240807-205100-2728cdc +stdlibFileVersion=1.10.0-20240814-133200-74f4d63 +stdlibMimeVersion=2.10.0-20240814-133200-6c54439 stdlibUuidVersion=1.8.0 -stdlibAuthVersion=2.12.0-20240807-214700-37b31bb -stdlibJwtVersion=2.13.0-20240809-095500-b9d03ed -stdlibOAuth2Version=2.12.0-20240807-220200-7f7294b +stdlibAuthVersion=2.12.0-20240814-133000-6db5624 +stdlibJwtVersion=2.13.0-20240814-133100-630021f +stdlibOAuth2Version=2.12.0-20240814-133400-a7008e4 -stdlibHttpVersion=2.12.0-20240809-111500-91b1ccd +stdlibHttpVersion=2.12.0-20240814-145000-dcdc9a0 # Ballerinax Observer -observeVersion=1.3.0-20240807-093200-e29ca7a -observeInternalVersion=1.3.0-20240807-094500-91e2d3a +observeVersion=1.3.0-20240814-114100-0f71e1e +observeInternalVersion=1.3.0-20240814-114900-8a734a3