Skip to content

Commit 3b02f8a

Browse files
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)
* CORE-69: Update sbt-scalafix from 0.14.0 to 0.14.2 * CORE-69: Update logback-classic from 1.5.16 to 1.5.18 * CORE-69: Update commons-codec from 1.17.2 to 1.18.0 * CORE-69: Update liquibase-core from 4.31.0 to 4.31.1 * CORE-69: Update sbt from 1.10.7 to 1.10.11 * CORE-69: Update sbt-scoverage from 2.3.0 to 2.3.1 * bump sbt --------- Co-authored-by: Marcus Talbott <[email protected]>
1 parent 0ccc1bd commit 3b02f8a

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.github/workflows/verify_consumer_pacts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ jobs:
321321
-e JANITOR_CLIENT_CREDENTIAL_FILE_PATH="" \
322322
-e JANITOR_TRACK_RESOURCE_PROJECT_ID="" \
323323
-e JANITOR_TRACK_RESOURCE_TOPIC_ID="" \
324-
sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.16 \
324+
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.10.11_2.13.16 \
325325
bash -c "git config --global --add safe.directory /working/sam && sbt \"set scalafmtOnCompile := false\" \"project pact4s\" \"testOnly *SamProviderSpec\""
326326
327327
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.

automation/Dockerfile-tests

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.16
1+
FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.10.11_2.13.16
22

33
COPY src /app/src
44
COPY test.sh /app

automation/project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.7
1+
sbt.version=1.10.11

codegen_java/project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.7
1+
sbt.version=1.10.11

docker/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ function make_jar()
9696
GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h)
9797

9898
# make jar. cache sbt dependencies.
99-
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
99+
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
100100
sleep 40
101-
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
101+
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
102102
EXIT_CODE=$?
103103
set -e # Turn error detection back on for the rest of the script
104104

docker/build_jar.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
# Get the last commit hash of the model directory and set it as an environment variable
99
GIT_MODEL_HASH=$(git log -n 1 --pretty=format:%h)
1010

11-
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
11+
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
1212
EXIT_CODE=$?
1313

1414
if [ $EXIT_CODE != 0 ]; then

project/Dependencies.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object Dependencies {
4747
val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % jacksonV
4848

4949
val logstashLogback: ModuleID = "net.logstash.logback" % "logstash-logback-encoder" % "8.0"
50-
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.16"
50+
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.18"
5151
val ravenLogback: ModuleID = "com.getsentry.raven" % "raven-logback" % "7.8.6"
5252
val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingV
5353
val ficus: ModuleID = "com.iheart" %% "ficus" % "1.5.2"
@@ -116,7 +116,7 @@ object Dependencies {
116116
val googleStorageLocal: ModuleID =
117117
"com.google.cloud" % "google-cloud-nio" % "0.127.29" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs
118118

119-
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.0"
119+
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.1"
120120

121121
val circeYAML: ModuleID = "io.circe" %% "circe-yaml" % "0.16.0"
122122
val snakeYAML: ModuleID = "org.yaml" % "snakeyaml" % "2.4"
@@ -187,7 +187,7 @@ object Dependencies {
187187
val terraCommonLib = tclExclusions("bio.terra" % "terra-common-lib" % tclVersion classifier "plain")
188188

189189
// was included transitively before, now explicit
190-
val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.17.2"
190+
val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.18.0"
191191

192192
val rootDependencies = Seq(
193193
// proactively pull in latest versions of Jackson libs, instead of relying on the versions

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.7
1+
sbt.version=1.10.11

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
22

33
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
44

5-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
5+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
66

77
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
88

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

1111
addDependencyTreePlugin

0 commit comments

Comments
 (0)