diff --git a/automation/Dockerfile-tests b/automation/Dockerfile-tests index 9b60b2be1..5c4176c57 100644 --- a/automation/Dockerfile-tests +++ b/automation/Dockerfile-tests @@ -1,4 +1,4 @@ -FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 +FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 COPY src /app/src COPY test.sh /app diff --git a/automation/project/build.properties b/automation/project/build.properties index 7a159c441..fe69360b7 100644 --- a/automation/project/build.properties +++ b/automation/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.6 +sbt.version = 1.10.7 diff --git a/benchmarks/project/build.properties b/benchmarks/project/build.properties index e88a0d817..73df629ac 100644 --- a/benchmarks/project/build.properties +++ b/benchmarks/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 diff --git a/jenkins/ittests.sh b/jenkins/ittests.sh index ce5086e1b..f687b2beb 100755 --- a/jenkins/ittests.sh +++ b/jenkins/ittests.sh @@ -6,7 +6,7 @@ set -eux ./docker/run-es.sh start # execute tests, overriding elasticsearch.urls to point at the linked container -SBT_IMAGE=sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 +SBT_IMAGE=sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 docker run --rm \ --link elasticsearch-ittest:elasticsearch-ittest \ -v sbt-cache:/root/.sbt \ diff --git a/local-dev/templates/docker-rsync-local-orch.sh b/local-dev/templates/docker-rsync-local-orch.sh index 95a04ce84..19688688f 100755 --- a/local-dev/templates/docker-rsync-local-orch.sh +++ b/local-dev/templates/docker-rsync-local-orch.sh @@ -111,7 +111,7 @@ start_server () { -p 5051:5051 \ --network=fc-orch \ -e JAVA_OPTS="$DOCKER_JAVA_OPTS" \ - sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 \ + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 \ bash -c "git config --global --add safe.directory /app && sbt \~reStart" docker cp config/firecloud-account.pem orch-sbt:/etc/firecloud-account.pem diff --git a/project/build.properties b/project/build.properties index e88a0d817..73df629ac 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 diff --git a/script/build.sh b/script/build.sh index c6bdde358..e12f7d7e1 100755 --- a/script/build.sh +++ b/script/build.sh @@ -96,7 +96,7 @@ function make_jar() docker run --rm -e GIT_MODEL_HASH=${GIT_MODEL_HASH} \ -v $PWD:/working -w /working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 \ - sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/src/docker/install.sh /working + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 /working/src/docker/install.sh /working } function docker_cmd() diff --git a/script/build_jar.sh b/script/build_jar.sh index 3252a2bde..e58ed63c2 100755 --- a/script/build_jar.sh +++ b/script/build_jar.sh @@ -12,7 +12,7 @@ docker run --rm -e GIT_MODEL_HASH=${GIT_MODEL_HASH} \ -v $PWD:/working \ -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 \ -w /working \ - sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 /working/src/docker/clean_install.sh /working + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 /working/src/docker/clean_install.sh /working EXIT_CODE=$?