From caa7a16c509ab90c21aadc8b76b4ec228e4e4b84 Mon Sep 17 00:00:00 2001 From: aashikam Date: Mon, 5 Aug 2024 21:15:17 +0530 Subject: [PATCH 1/3] Update docker command to docker compose v2 --- ballerina-tests/build.gradle | 4 ++-- .../tests/server/{docker-compose.yaml => compose.yaml} | 1 - ballerina/build.gradle | 4 ++-- ballerina/tests/server/{docker-compose.yaml => compose.yaml} | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) rename ballerina-tests/tests/server/{docker-compose.yaml => compose.yaml} (98%) rename ballerina/tests/server/{docker-compose.yaml => compose.yaml} (98%) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index 6c3231d1..3f0ab022 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -111,7 +111,7 @@ task startNatsServersForTests() { if (!stdOut.toString().contains("server_nats-tls_1")) { println "Starting NATS Basic server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml up -d" + commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml up -d" standardOutput = stdOut } println stdOut.toString() @@ -141,7 +141,7 @@ task stopNatsServersForTests() { if (stdOut.toString().contains("server_nats-tls_1")) { println "Stopping NATS server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml rm -svf" + commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml rm -svf" standardOutput = stdOut } println stdOut.toString() diff --git a/ballerina-tests/tests/server/docker-compose.yaml b/ballerina-tests/tests/server/compose.yaml similarity index 98% rename from ballerina-tests/tests/server/docker-compose.yaml rename to ballerina-tests/tests/server/compose.yaml index cd5b4711..6bf6fe9d 100644 --- a/ballerina-tests/tests/server/docker-compose.yaml +++ b/ballerina-tests/tests/server/compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: nats-tls: image: nats:latest diff --git a/ballerina/build.gradle b/ballerina/build.gradle index d4dbf60f..baa1d901 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -115,7 +115,7 @@ task startNatsServers() { if (!stdOut.toString().contains("server_nats-tls_1")) { println "Starting NATS Basic server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml up -d" + commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml up -d" standardOutput = stdOut } println stdOut.toString() @@ -138,7 +138,7 @@ task stopNatsServers() { if (stdOut.toString().contains("server_nats-tls_1")) { println "Stopping NATS server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/docker-compose.yaml rm -svf" + commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml rm -svf" standardOutput = stdOut } println stdOut.toString() diff --git a/ballerina/tests/server/docker-compose.yaml b/ballerina/tests/server/compose.yaml similarity index 98% rename from ballerina/tests/server/docker-compose.yaml rename to ballerina/tests/server/compose.yaml index 5da8f7de..d13a0128 100644 --- a/ballerina/tests/server/docker-compose.yaml +++ b/ballerina/tests/server/compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: nats-1: image: nats:latest From 270950444ead1636f2256754224b9fcff32c4a5c Mon Sep 17 00:00:00 2001 From: aashikam Date: Mon, 5 Aug 2024 21:16:36 +0530 Subject: [PATCH 2/3] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 6 +++--- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 87e7e30d..92eeada4 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerinax" name = "nats" -version = "3.0.0" +version = "3.0.1" authors = ["Ballerina"] keywords = ["service", "client", "messaging", "network", "pubsub"] repository = "https://github.com/ballerina-platform/module-ballerinax-nats" @@ -18,8 +18,8 @@ path = "./lib/jnats-2.16.0.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "nats-native" -version = "3.0.0" -path = "../native/build/libs/nats-native-3.0.0.jar" +version = "3.0.1" +path = "../native/build/libs/nats-native-3.0.1-SNAPSHOT.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 1ae1b730..276e9eb3 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "nats-compiler-plugin" class = "io.ballerina.stdlib.nats.plugin.NatsCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.0.0.jar" +path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.0.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 21687929..62c0f49e 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.0" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -187,7 +187,7 @@ modules = [ [[package]] org = "ballerinax" name = "nats" -version = "3.0.0" +version = "3.0.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, From c746f0fce1764250709e87d121868b10eb75e56a Mon Sep 17 00:00:00 2001 From: aashikam Date: Mon, 5 Aug 2024 21:17:13 +0530 Subject: [PATCH 3/3] Update docker command to docker compose v2 --- ballerina-tests/build.gradle | 4 ++-- ballerina/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle index 3f0ab022..387babb6 100644 --- a/ballerina-tests/build.gradle +++ b/ballerina-tests/build.gradle @@ -111,7 +111,7 @@ task startNatsServersForTests() { if (!stdOut.toString().contains("server_nats-tls_1")) { println "Starting NATS Basic server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml up -d" + commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml up -d" standardOutput = stdOut } println stdOut.toString() @@ -141,7 +141,7 @@ task stopNatsServersForTests() { if (stdOut.toString().contains("server_nats-tls_1")) { println "Stopping NATS server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml rm -svf" + commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml rm -svf" standardOutput = stdOut } println stdOut.toString() diff --git a/ballerina/build.gradle b/ballerina/build.gradle index baa1d901..0e80fa2b 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -115,7 +115,7 @@ task startNatsServers() { if (!stdOut.toString().contains("server_nats-tls_1")) { println "Starting NATS Basic server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml up -d" + commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml up -d" standardOutput = stdOut } println stdOut.toString() @@ -138,7 +138,7 @@ task stopNatsServers() { if (stdOut.toString().contains("server_nats-tls_1")) { println "Stopping NATS server." exec { - commandLine 'sh', '-c', "docker-compose -f tests/server/compose.yaml rm -svf" + commandLine 'sh', '-c', "docker compose -f tests/server/compose.yaml rm -svf" standardOutput = stdOut } println stdOut.toString()