Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker command to docker-compose v2 #129

Merged
merged 4 commits into from
Aug 5, 2024
Merged

Update docker command to docker-compose v2 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ebf6e6
Update docker command to docker-compose v2
ayeshLK Aug 2, 2024
0c372d3
[Automated] Update the native jar versions
ayeshLK Aug 2, 2024
481182e
Revert "[Automated] Update the native jar versions"
ayeshLK Aug 2, 2024
16e5b2c
[Automated] Update the native jar versions
ayeshLK Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerinax"
name = "java.jms"
version = "1.0.1"
version = "1.0.2"
authors = ["Ballerina"]
keywords = ["jms"]
repository = "https://github.com/ballerina-platform/module-ballerina-java.jms"
Expand All @@ -18,8 +18,8 @@ graalvmCompatible = true
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "java.jms-native"
version = "1.0.1"
path = "../native/build/libs/java.jms-native-1.0.1.jar"
version = "1.0.2"
path = "../native/build/libs/java.jms-native-1.0.2-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "org.slf4j"
Expand Down
4 changes: 2 additions & 2 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.2.0"
version = "1.2.3"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down Expand Up @@ -81,7 +81,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "java.jms"
version = "1.0.1"
version = "1.0.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.runtime"},
Expand Down
4 changes: 2 additions & 2 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ task startActiveMQServer() {
if (!stdOut.toString().contains("activemq-test")) {
println "Starting ActiveMQ server."
exec {
commandLine 'sh', '-c', "docker-compose -f tests/resources/docker-compose.yaml up -d"
commandLine 'sh', '-c', "docker compose -f tests/resources/docker-compose.yaml up -d"
standardOutput = stdOut
}
println stdOut.toString()
Expand All @@ -136,7 +136,7 @@ task stopActiveMQServer() {
if (stdOut.toString().contains("activemq-test")) {
println "Stopping ActiveMQ server."
exec {
commandLine 'sh', '-c', "docker-compose -f tests/resources/docker-compose.yaml rm -svf"
commandLine 'sh', '-c', "docker compose -f tests/resources/docker-compose.yaml rm -svf"
standardOutput = stdOut
}
println stdOut.toString()
Expand Down
2 changes: 0 additions & 2 deletions ballerina/tests/resources/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
activemq:
image: 'apache/activemq-classic:6.0.0'
Expand Down
2 changes: 0 additions & 2 deletions examples/ez-food/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
order-svc:
image: 'ballerina/ordersvc:1.0.0'
Expand Down
Loading