From 3efd9c5d08fcc1dfa4484ba9dd113585477d2c69 Mon Sep 17 00:00:00 2001
From: David An <davidan@broadinstitute.org>
Date: Thu, 31 Oct 2024 11:02:22 -0400
Subject: [PATCH] CORE-69: update sbt, scoverage, scala-sbt docker image tags
 (#1474)

---
 .scala-steward.conf                            | 2 +-
 automation/Dockerfile-tests                    | 2 +-
 automation/project/build.properties            | 2 +-
 jenkins/ittests.sh                             | 2 +-
 local-dev/templates/docker-rsync-local-orch.sh | 2 +-
 project/build.properties                       | 2 +-
 project/plugins.sbt                            | 2 +-
 script/build.sh                                | 2 +-
 script/build_jar.sh                            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.scala-steward.conf b/.scala-steward.conf
index da5bbb421..3cdf0061a 100644
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -73,7 +73,7 @@ updatePullRequests = "on-conflicts"
 # If set, Scala Steward will use this message template for the commit messages and PR titles.
 # Supported variables: ${artifactName}, ${currentVersion}, ${nextVersion} and ${default}
 # Default: "${default}" which is equivalent to "Update ${artifactName} to ${nextVersion}"
-commits.message = "[AJ-1784] Update ${artifactName} from ${currentVersion} to ${nextVersion}"
+commits.message = "CORE-69: Update ${artifactName} from ${currentVersion} to ${nextVersion}"
 
 # If true and when upgrading version in .scalafmt.conf, Scala Steward will perform scalafmt
 # and add a separate commit when format changed. So you don't need reformat manually and can merge PR.
diff --git a/automation/Dockerfile-tests b/automation/Dockerfile-tests
index d0f981415..d09fc0129 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-jammy-17.0.10_7_1.10.4_2.13.15
 
 COPY src /app/src
 COPY test.sh /app
diff --git a/automation/project/build.properties b/automation/project/build.properties
index 23f7d9793..04a3949ca 100644
--- a/automation/project/build.properties
+++ b/automation/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.10.2
+sbt.version = 1.10.4
diff --git a/jenkins/ittests.sh b/jenkins/ittests.sh
index 1c00e487b..62e7378fe 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-jammy-17.0.10_7_1.10.2_2.13.15
+SBT_IMAGE=sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.4_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 33b5ea376..94befe093 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-jammy-17.0.10_7_1.10.2_2.13.15 \
+    sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.4_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 0b699c305..09feeeed5 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d26c78e72..f31d08aa4 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")
 
diff --git a/script/build.sh b/script/build.sh
index 8db911219..39f6c4ebd 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-jammy-17.0.10_7_1.10.2_2.13.15 /working/src/docker/install.sh /working
+        sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.4_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 80176a1f3..08178cfb0 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-jammy-17.0.10_7_1.10.2_2.13.15 /working/src/docker/clean_install.sh /working
+  sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.4_2.13.15 /working/src/docker/clean_install.sh /working
 
 EXIT_CODE=$?