Skip to content

Commit

Permalink
Merge pull request #945 from aashikam/dockerv2
Browse files Browse the repository at this point in the history
Update docker command to docker compose v2
  • Loading branch information
niveathika authored Aug 5, 2024
2 parents 53d1cd9 + 8bfbef1 commit 0df2100
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
6 changes: 3 additions & 3 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerinax"
name = "rabbitmq"
version = "3.0.1"
version = "3.0.2"
authors = ["Ballerina"]
keywords = ["service", "client", "messaging", "network", "pubsub"]
repository = "https://github.com/ballerina-platform/module-ballerinax-rabbitmq"
Expand All @@ -18,8 +18,8 @@ path = "./lib/amqp-client-5.18.0.jar"
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "rabbitmq-native"
version = "3.0.1"
path = "../native/build/libs/rabbitmq-native-3.0.1.jar"
version = "3.0.2"
path = "../native/build/libs/rabbitmq-native-3.0.2-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "rabbitmq-compiler-plugin"
class = "io.ballerina.stdlib.rabbitmq.plugin.RabbitmqCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/rabbitmq-compiler-plugin-3.0.1.jar"
path = "../compiler-plugin/build/libs/rabbitmq-compiler-plugin-3.0.2-SNAPSHOT.jar"
4 changes: 2 additions & 2 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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"}
Expand Down Expand Up @@ -387,7 +387,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "rabbitmq"
version = "3.0.1"
version = "3.0.2"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "crypto"},
Expand Down
4 changes: 2 additions & 2 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ task startRabbitmqServer() {
if (!stdOut.toString().contains("server_rabbitmq-1_1")) {
println "Starting RabbitMQ 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()
Expand All @@ -139,7 +139,7 @@ task stopRabbitmqServer() {
if (stdOut.toString().contains("server_rabbitmq-1_1")) {
println "Stopping RabbitMQ 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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
rabbitmq-tls:
image: rabbitmq:3-management
Expand Down

0 comments on commit 0df2100

Please sign in to comment.