From e8eaf0acf183bc536def1b713a69a6fa99af903f Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Fri, 2 Aug 2024 22:50:40 +0530 Subject: [PATCH 1/2] 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/2] [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"},