diff --git a/.github/workflows/verify_consumer_pacts.yml b/.github/workflows/verify_consumer_pacts.yml index 6322defc9..7c66a5ec4 100644 --- a/.github/workflows/verify_consumer_pacts.yml +++ b/.github/workflows/verify_consumer_pacts.yml @@ -319,7 +319,7 @@ jobs: -e JANITOR_CLIENT_CREDENTIAL_FILE_PATH="" \ -e JANITOR_TRACK_RESOURCE_PROJECT_ID="" \ -e JANITOR_TRACK_RESOURCE_TOPIC_ID="" \ - sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 \ + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 \ bash -c "git config --global --add safe.directory /working/sam && sbt \"set scalafmtOnCompile := false\" \"project pact4s\" \"testOnly *SamProviderSpec\"" can-i-deploy: # The can-i-deploy job will run as a result of a Sam PR. It reports the pact verification statuses on all deployed environments. diff --git a/automation/Dockerfile-tests b/automation/Dockerfile-tests index d0f981415..9b60b2be1 100644 --- a/automation/Dockerfile-tests +++ b/automation/Dockerfile-tests @@ -1,4 +1,4 @@ -FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 +FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.5_2.13.15 COPY src /app/src COPY test.sh /app diff --git a/automation/project/build.properties b/automation/project/build.properties index 3829f19f7..c7450fc2a 100644 --- a/automation/project/build.properties +++ b/automation/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 \ No newline at end of file +sbt.version=1.10.5 \ No newline at end of file diff --git a/codegen_java/project/build.properties b/codegen_java/project/build.properties index 0b699c305..db1723b08 100644 --- a/codegen_java/project/build.properties +++ b/codegen_java/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.5 diff --git a/docker/build.sh b/docker/build.sh index 2ec1aab77..8b47ce6d1 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -96,9 +96,9 @@ function make_jar() GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h) # make jar. cache sbt dependencies. - docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 /working/docker/init_schema.sh /working + docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/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/docker/init_schema.sh /working sleep 40 - docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 /working/docker/install.sh /working + docker run --rm --link postgres:postgres -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/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/docker/install.sh /working EXIT_CODE=$? set -e # Turn error detection back on for the rest of the script diff --git a/docker/build_jar.sh b/docker/build_jar.sh index 9258e77eb..15e40fd8a 100755 --- a/docker/build_jar.sh +++ b/docker/build_jar.sh @@ -8,7 +8,7 @@ set -e # Get the last commit hash of the model directory and set it as an environment variable GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h) -docker run --rm -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/working -v jar-cache:/root/.ivy -v jar-cache:/root/.ivy2 sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.2_2.13.15 /working/docker/clean_install.sh /working +docker run --rm -e GIT_MODEL_HASH=$GIT_MODEL_HASH -v $PWD:/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/docker/clean_install.sh /working EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/project/build.properties b/project/build.properties index 0b699c305..db1723b08 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8224092da..58bd30477 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")