From 93ab990ee21279a24ea6cb88c16ac5091e8a93eb Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:00 +0000 Subject: [PATCH 1/7] CORE-69: Update sbt-scalafix from 0.14.0 to 0.14.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7544ffe6b..e5bb8785c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") addDependencyTreePlugin From 5c7454b4121b3fa4872fabb50e79447b4133a548 Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:04 +0000 Subject: [PATCH 2/7] CORE-69: Update logback-classic from 1.5.16 to 1.5.18 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0045768d7..f1edff83d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -47,7 +47,7 @@ object Dependencies { val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % jacksonV val logstashLogback: ModuleID = "net.logstash.logback" % "logstash-logback-encoder" % "8.0" - val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.16" + val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.18" val ravenLogback: ModuleID = "com.getsentry.raven" % "raven-logback" % "7.8.6" val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingV val ficus: ModuleID = "com.iheart" %% "ficus" % "1.5.2" From 76e57d11ec97ebd62b9c26af6d9cf2f4a108d487 Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:08 +0000 Subject: [PATCH 3/7] CORE-69: Update commons-codec from 1.17.2 to 1.18.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f1edff83d..81dc7a004 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -187,7 +187,7 @@ object Dependencies { val terraCommonLib = tclExclusions("bio.terra" % "terra-common-lib" % tclVersion classifier "plain") // was included transitively before, now explicit - val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.17.2" + val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.18.0" val rootDependencies = Seq( // proactively pull in latest versions of Jackson libs, instead of relying on the versions From 7977f33e58c76225feaa3c64b477d93a9ca682a0 Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:12 +0000 Subject: [PATCH 4/7] CORE-69: Update liquibase-core from 4.31.0 to 4.31.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 81dc7a004..8f347a3a7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -116,7 +116,7 @@ object Dependencies { val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.29" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs - val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.0" + val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.1" val circeYAML: ModuleID = "io.circe" %% "circe-yaml" % "0.16.0" val snakeYAML: ModuleID = "org.yaml" % "snakeyaml" % "2.4" From 5b6edcc3a9c7d4d8611926e7c4e338583dd3f5a2 Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:14 +0000 Subject: [PATCH 5/7] CORE-69: Update sbt from 1.10.7 to 1.10.11 --- .github/workflows/verify_consumer_pacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify_consumer_pacts.yml b/.github/workflows/verify_consumer_pacts.yml index 5c61ce616..cd898b86f 100644 --- a/.github/workflows/verify_consumer_pacts.yml +++ b/.github/workflows/verify_consumer_pacts.yml @@ -321,7 +321,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-17.0.13_11_1.10.7_2.13.16 \ + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.11_2.13.16 \ 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. From 768d3993da82d9c520714032d16a24410a8e424b Mon Sep 17 00:00:00 2001 From: broadbot Date: Fri, 2 May 2025 12:03:18 +0000 Subject: [PATCH 6/7] CORE-69: Update sbt-scoverage from 2.3.0 to 2.3.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e5bb8785c..32f690d91 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From da3ad18f8208b75dddb4421a48108e9119b345b6 Mon Sep 17 00:00:00 2001 From: Marcus Talbott Date: Fri, 2 May 2025 10:24:07 -0400 Subject: [PATCH 7/7] bump sbt --- .github/workflows/verify_consumer_pacts.yml | 2 +- automation/Dockerfile-tests | 2 +- automation/project/build.properties | 2 +- codegen_java/project/build.properties | 2 +- docker/build.sh | 4 ++-- docker/build_jar.sh | 2 +- project/build.properties | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/verify_consumer_pacts.yml b/.github/workflows/verify_consumer_pacts.yml index cd898b86f..0e3fbace1 100644 --- a/.github/workflows/verify_consumer_pacts.yml +++ b/.github/workflows/verify_consumer_pacts.yml @@ -321,7 +321,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-17.0.13_11_1.10.11_2.13.16 \ + sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.10.11_2.13.16 \ 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 725b8916c..088a4ce7d 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.7_2.13.16 +FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.10.11_2.13.16 COPY src /app/src COPY test.sh /app diff --git a/automation/project/build.properties b/automation/project/build.properties index 0a832a2de..cc68b53f1 100644 --- a/automation/project/build.properties +++ b/automation/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 \ No newline at end of file +sbt.version=1.10.11 diff --git a/codegen_java/project/build.properties b/codegen_java/project/build.properties index 73df629ac..cc68b53f1 100644 --- a/codegen_java/project/build.properties +++ b/codegen_java/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.11 diff --git a/docker/build.sh b/docker/build.sh index d1e2a48c3..161384b68 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-17.0.13_11_1.10.7_2.13.16 /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.15_6_1.10.11_2.13.16 /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-17.0.13_11_1.10.7_2.13.16 /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.15_6_1.10.11_2.13.16 /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 e89a0a02b..76ab6b94a 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-17.0.13_11_1.10.7_2.13.16 /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.15_6_1.10.11_2.13.16 /working/docker/clean_install.sh /working EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/project/build.properties b/project/build.properties index 73df629ac..cc68b53f1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.11