Skip to content

CORE-69: Minor and patch updates - liquibase-core to 4.31.1 - commons-codec to 1.18.0 - logback-classic to 1.5.18 - sbt-scalafix to 0.14.2 - sbt-scoverage to 2.3.1 - sbt and 2 more to 1.10.11 #1684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/verify_consumer_pacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.
Expand Down
2 changes: 1 addition & 1 deletion automation/Dockerfile-tests
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion automation/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.10.11
2 changes: 1 addition & 1 deletion codegen_java/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.10.11
4 changes: 2 additions & 2 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/build_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.10.11
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ 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")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")

addDependencyTreePlugin
Loading