From 679a202b27897fa6185bbb8528a72893f18a7f9e Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 26 Aug 2024 17:49:25 +0530 Subject: [PATCH 1/5] Update docker-compose command to docker compose --- ballerina-tests/build.gradle | 2 +- .../resources/openldap/{docker-compose.yml => compose.yml} | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename ballerina-tests/tests/resources/openldap/{docker-compose.yml => compose.yml} (96%) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index e5b52eb90..bd64095c6 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-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 From 965845cd53d3c60053364dc0b4266fac1ff6d4c5 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Mon, 26 Aug 2024 19:30:42 +0530 Subject: [PATCH 2/5] Update docker-compose command to docker compose --- ballerina-tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index bd64095c6..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/compose.yml rm -svf" + commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml rm -svf" standardOutput = stdOut } println stdOut.toString() From 2df999f3b12118722718c37a0476c792e4e33a7e Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 27 Aug 2024 09:48:23 +0530 Subject: [PATCH 3/5] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 ++++---- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) 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..8afdd1776 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.9.0" [[package]] org = "ballerina" name = "auth" -version = "2.11.0" +version = "2.11.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -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"}, @@ -94,7 +94,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.11.0" +version = "2.11.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -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"} From 718b9d44bb5c10226335c6e06dad96b12a603b37 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 27 Aug 2024 10:28:12 +0530 Subject: [PATCH 4/5] Update docker-compose command to docker compose in ballerina --- ballerina/build.gradle | 2 +- .../resources/openldap/{docker-compose.yml => compose.yml} | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename ballerina/tests/resources/openldap/{docker-compose.yml => compose.yml} (96%) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index d0ec11b9d..d13af6762 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 02ad70c0dbba1d4e83ca1081e7d1e855a320648f Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 27 Aug 2024 10:45:20 +0530 Subject: [PATCH 5/5] Update ballerina/build.gradle --- ballerina/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index d13af6762..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/compose.yml up -d" + commandLine 'sh', '-c', "docker compose -f tests/resources/openldap/compose.yml up -d" standardOutput = stdOut } println stdOut.toString()