diff --git a/changelog/@unreleased/pr-607.v2.yml b/changelog/@unreleased/pr-607.v2.yml new file mode 100644 index 00000000..1ac7bd3e --- /dev/null +++ b/changelog/@unreleased/pr-607.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: Update dependencies so docker compose v2 is used by default, and remove + old unused scripts. + links: + - https://github.com/palantir/docker-proxy-rule/pull/607 diff --git a/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml b/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml index 9b64c179..a6509985 100644 --- a/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml +++ b/docker-proxy-junit-jupiter/src/integrationTest/resources/DockerProxyExtensionTest-services.yml @@ -1,5 +1,3 @@ -version: '2' - services: webserver: hostname: web diff --git a/docker-proxy-rule-core-jdk21/src/integrationTest/resources/DockerProxyExtensionJdk21Test-services.yml b/docker-proxy-rule-core-jdk21/src/integrationTest/resources/DockerProxyExtensionJdk21Test-services.yml index 9b64c179..a6509985 100644 --- a/docker-proxy-rule-core-jdk21/src/integrationTest/resources/DockerProxyExtensionJdk21Test-services.yml +++ b/docker-proxy-rule-core-jdk21/src/integrationTest/resources/DockerProxyExtensionJdk21Test-services.yml @@ -1,5 +1,3 @@ -version: '2' - services: webserver: hostname: web diff --git a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml index c670cdac..fa2888bf 100644 --- a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml +++ b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml @@ -1,5 +1,3 @@ -version: '2' - services: proxy: image: {{IMAGE_NAME}} diff --git a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml index 9b64c179..a6509985 100644 --- a/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml +++ b/docker-proxy-rule-junit4/src/integrationTest/resources/DockerProxyRuleTest-services.yml @@ -1,5 +1,3 @@ -version: '2' - services: webserver: hostname: web diff --git a/scripts/circle-ci/download-moreutils.sh b/scripts/circle-ci/download-moreutils.sh deleted file mode 100755 index 6c2836c1..00000000 --- a/scripts/circle-ci/download-moreutils.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -x -e - -MOREUTILS="moreutils_0.60-1_amd64.deb" - -curl -O "http://snapshot.debian.org/archive/debian/20170123T091837Z/pool/main/m/moreutils/$MOREUTILS" -ar p $MOREUTILS data.tar.xz | sudo tar xJ --strip-components=3 -C /usr/bin/ ./usr/bin/ts -rm $MOREUTILS diff --git a/scripts/circle-ci/install-docker.sh b/scripts/circle-ci/install-docker.sh deleted file mode 100755 index ebc5c74d..00000000 --- a/scripts/circle-ci/install-docker.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -x - -MIN_VERSION_WANTED=1.10.0 -CURRENT_VERSION=$(docker version --format '{{.Client.Version}}') - -if [ "$MIN_VERSION_WANTED" != "$(echo -e "$CURRENT_VERSION\n$MIN_VERSION_WANTED" | sort -V | head -n 1)" ]; then - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- "$MIN_VERSION_WANTED" -fi diff --git a/scripts/time-cmd.sh b/scripts/time-cmd.sh deleted file mode 100755 index 2de8daef..00000000 --- a/scripts/time-cmd.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -o pipefail - -"$@" 2>&1 | ts -s "[%H:%M:%S]" diff --git a/versions.lock b/versions.lock index 4d2f692f..e6a5169d 100644 --- a/versions.lock +++ b/versions.lock @@ -1,10 +1,10 @@ # Run ./gradlew writeVersionsLock to regenerate this file com.fasterxml.jackson.core:jackson-annotations:2.15.3 (5 constraints: ba5ce35e) -com.fasterxml.jackson.core:jackson-core:2.15.3 (9 constraints: 02cbb5a7) -com.fasterxml.jackson.core:jackson-databind:2.15.3 (13 constraints: 0a08fda5) +com.fasterxml.jackson.core:jackson-core:2.15.3 (9 constraints: 04cb35aa) +com.fasterxml.jackson.core:jackson-databind:2.15.3 (13 constraints: 0c0823aa) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (1 constraints: 7e1c99a4) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (1 constraints: 7e1c99a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (1 constraints: f215aae8) +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2 (1 constraints: f415b2e8) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (1 constraints: 7e1c99a4) com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (1 constraints: 7e1c99a4) com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.3 (1 constraints: 7e1c99a4) @@ -18,10 +18,10 @@ com.google.guava:guava:21.0 (2 constraints: cc2bc2d1) com.palantir.conjure.java:conjure-lib:5.67.0 (1 constraints: 661bc860) com.palantir.conjure.java.api:errors:2.19.0 (1 constraints: 2410a5a9) com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:6.16.0 (1 constraints: f715cbe8) -com.palantir.docker.compose:docker-compose-junit-jupiter:1.8.0 (1 constraints: 0b050836) -com.palantir.docker.compose:docker-compose-rule-core:1.8.0 (3 constraints: 1033d6c2) -com.palantir.docker.compose:docker-compose-rule-events-api-objects:1.8.0 (1 constraints: c315c2d2) -com.palantir.docker.compose:docker-compose-rule-junit4:1.8.0 (1 constraints: 0b050836) +com.palantir.docker.compose:docker-compose-junit-jupiter:2.3.0 (1 constraints: 0705fe35) +com.palantir.docker.compose:docker-compose-rule-core:2.3.0 (3 constraints: 0433bcbf) +com.palantir.docker.compose:docker-compose-rule-events-api-objects:2.3.0 (1 constraints: bf15b8d2) +com.palantir.docker.compose:docker-compose-rule-junit4:2.3.0 (1 constraints: 0705fe35) com.palantir.ri:resource-identifier:1.3.0 (1 constraints: ec0f6e99) com.palantir.safe-logging:preconditions:1.16.0 (4 constraints: 644ae273) com.palantir.safe-logging:safe-logging:1.16.0 (2 constraints: f920db6c) @@ -30,7 +30,7 @@ commons-io:commons-io:2.6 (1 constraints: 64156da7) javax.annotation:javax.annotation-api:1.3.2 (1 constraints: f10f7399) javax.ws.rs:javax.ws.rs-api:2.1.1 (1 constraints: f10f7399) joda-time:joda-time:2.10.8 (2 constraints: 222ca439) -junit:junit:4.13.2 (2 constraints: e31b93a3) +junit:junit:4.13.2 (2 constraints: 841bfe6b) one.util:streamex:0.8.1 (2 constraints: cd1a403c) org.apache.commons:commons-lang3:3.7 (1 constraints: 661571a7) org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac) @@ -40,8 +40,8 @@ org.hamcrest:hamcrest-core:2.1 (1 constraints: cc05fe3f) org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 0547af6b) org.junit.platform:junit-platform-commons:1.8.2 (2 constraints: dd200b4b) org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) -org.slf4j:slf4j-api:1.7.30 (2 constraints: fe2397b2) -org.yaml:snakeyaml:1.27 (1 constraints: 7217fa27) +org.slf4j:slf4j-api:1.7.36 (2 constraints: 042493b3) +org.yaml:snakeyaml:2.0 (1 constraints: 3a178910) [Test dependencies] net.bytebuddy:byte-buddy:1.14.11 (1 constraints: 460b40de) diff --git a/versions.props b/versions.props index 84c32de2..88d0a044 100644 --- a/versions.props +++ b/versions.props @@ -1,6 +1,6 @@ com.fasterxml.jackson.core:jackson-databind = 2.15.3 com.google.auto.service:* = 1.1.1 -com.palantir.docker.compose:* = 1.8.0 +com.palantir.docker.compose:* = 2.3.0 junit:junit = 4.13.2 one.util:streamex = 0.8.1 org.assertj:assertj-core = 3.22.0