Skip to content

CORE-69: Minor and patch updates - sentry-logback to 8.20.0 - spring-web to 6.2.10 - jackson-core and 1 more to 2.20.0 - google-cloud-nio to 0.128.3 - sbt and 2 more to 1.11.5 #1668

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.

Sign up for GitHub

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 8 commits into from
Sep 4, 2025
Merged

CORE-69: Minor and patch updates - sentry-logback to 8.20.0 - spring-web to 6.2.10 - jackson-core and 1 more to 2.20.0 - google-cloud-nio to 0.128.3 - sbt and 2 more to 1.11.5 #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9844d05
CORE-69: Update jackson-core from 2.19.2 to 2.20.0
broadbot Sep 1, 2025
c180c9f
CORE-69: Update jackson-databind from 2.19.2 to 2.20.0
broadbot Sep 1, 2025
cdc6f85
CORE-69: Update google-cloud-nio from 0.128.1 to 0.128.3
broadbot Sep 1, 2025
0c7b2f0
CORE-69: Update sentry-logback from 8.18.0 to 8.20.0
broadbot Sep 1, 2025
acc696a
CORE-69: Update sbt from 1.11.3 to 1.11.5
broadbot Sep 1, 2025
22aa682
CORE-69: Update spring-web from 6.2.9 to 6.2.10
broadbot Sep 1, 2025
8b4ae58
Merge branch 'develop' into update/minor_patch
davidangb Sep 3, 2025
925695e
update docker sbt
calypsomatic Sep 4, 2025
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 automation/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.3
sbt.version=1.11.5
2 changes: 1 addition & 1 deletion benchmarks/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.3
sbt.version=1.11.5
2 changes: 1 addition & 1 deletion local-dev/templates/docker-rsync-local-orch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ start_server () {
-p 5051:5051 \
--network=fc-orch \
-e JAVA_OPTS="$DOCKER_JAVA_OPTS" \
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.3_2.13.16 \
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.5_2.13.16 \
bash -c "git config --global --add safe.directory /app && sbt \~reStart"

docker cp config/firecloud-account.pem orch-sbt:/etc/firecloud-account.pem
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object Dependencies {

val rootDependencies: Seq[ModuleID] = Seq(
"ch.qos.logback" % "logback-classic" % "1.5.18",
"io.sentry" % "sentry-logback" % "8.18.0",
"io.sentry" % "sentry-logback" % "8.20.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"org.parboiled" % "parboiled-core" % "1.4.1",
"org.broadinstitute.dsde" %% "rawls-model" % "v0.0.537-SNAP"
Expand All @@ -57,7 +57,7 @@ object Dependencies {
"org.broadinstitute.dsde.workbench" %% "workbench-notifications" % s"2.0-$workbenchLibsHash",
"org.databiosphere" % "workspacedataservice-client-okhttp-jakarta" % "0.2.167-SNAPSHOT",
"bio.terra" % "externalcreds-client-resttemplate" % "1.83.0-SNAPSHOT" excludeAll (excludeSpring, excludeSpringBoot),
"org.springframework" % "spring-web" % "6.2.9" excludeAll (excludeSpringBoot, excludeSpringJcl),
"org.springframework" % "spring-web" % "6.2.10" excludeAll (excludeSpringBoot, excludeSpringJcl),
"com.typesafe.akka" %% "akka-actor" % akkaV,
"com.typesafe.akka" %% "akka-slf4j" % akkaV,
"com.typesafe.akka" %% "akka-http" % akkaHttpV excludeAll (excludeAkkaActor, excludeAkkaStream),
Expand All @@ -75,7 +75,7 @@ object Dependencies {
"org.scalatest" %% "scalatest" % "3.2.19" % "test",
"org.mock-server" % "mockserver-netty-no-dependencies" % "5.15.0" % "test",
// provides testing mocks
"com.google.cloud" % "google-cloud-nio" % "0.128.1" % "test",
"com.google.cloud" % "google-cloud-nio" % "0.128.3" % "test",
"org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % "test"
)
}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.3
sbt.version=1.11.5
2 changes: 1 addition & 1 deletion script/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-17.0.15_6_1.11.3_2.13.16 /working/src/docker/install.sh /working
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.5_2.13.16 /working/src/docker/install.sh /working
}

function docker_cmd()
Expand Down
2 changes: 1 addition & 1 deletion script/build_jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-17.0.15_6_1.11.3_2.13.16 /working/src/docker/clean_install.sh /working
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.5_2.13.16 /working/src/docker/clean_install.sh /working

EXIT_CODE=$?

Expand Down
Loading