diff --git a/build-bin/docker/docker_test_image b/build-bin/docker/docker_test_image index fad9da0d..0cdecef0 100755 --- a/build-bin/docker/docker_test_image +++ b/build-bin/docker/docker_test_image @@ -20,7 +20,7 @@ docker_container=${3:-sut} # First try to run the intended containers. health_rc=0 if test -f "${docker_compose_file}"; then - docker-compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1 + docker compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1 else docker run --name ${docker_container} -d ${DOCKER_IMAGE} || health_rc=1 fi diff --git a/pom.xml b/pom.xml index b2ed27fa..2cc79fdc 100644 --- a/pom.xml +++ b/pom.xml @@ -69,15 +69,15 @@ io.zipkin.zipkin2 - 3.4.0 + 3.4.1 3.4.0 - 3.3.0 - 2.17.1 + 3.3.3 + 2.17.2 com.linecorp.armeria 1.28.4 - 4.1.110.Final + 4.1.113.Final 2.23.1 @@ -92,14 +92,14 @@ 4.12.0 3.25.3 - 4.2.1 - 5.10.2 - 5.12.0 + 4.2.2 + 5.11.0 + 5.13.0 - 2.27.1 - 1.10.4 + 2.30.0 + 1.11.0 ${skipTests} @@ -108,22 +108,22 @@ 1.2.8 - 4.3 + 4.5 5.1.9 3.13.0 3.6.1 - 3.1.1 + 3.1.2 3.4.1 3.4.0 - 3.1.1 + 3.1.2 3.6.3 - 3.3.0 + 3.4.1 3.0.1 - 3.5.2 + 3.6.0 3.3.1 - 3.2.5 + 3.5.0 1.6.13 @@ -175,7 +175,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit-jupiter.version} test