Merge branch 'develop' into update/google-api-services-storage-v1-rev20250925-2.0.0

Author: calypsomatic

.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.15_6_1.11.5_2.13.16 \
+                          sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.6_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.

automation/Dockerfile-tests

@@ -1,4 +1,4 @@
-FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.5_2.13.16
+FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.6_2.13.16
 
 COPY src /app/src
 COPY test.sh /app

automation/project/Dependencies.scala

@@ -29,7 +29,7 @@ object Dependencies {
     "com.fasterxml.jackson.module" % ("jackson-module-scala_" + scalaV) % jacksonV,
     "ch.qos.logback" % "logback-classic" % "1.4.5",
     "org.slf4j" % "slf4j-api" % "2.0.3",
-    "net.logstash.logback" % "logstash-logback-encoder" % "8.1" exclude("com.fasterxml.jackson.core", "jackson-databind"),
+    "net.logstash.logback" % "logstash-logback-encoder" % "8.1" exclude ("com.fasterxml.jackson.core", "jackson-databind"),
     "com.google.apis" % "google-api-services-oauth2" % "v1-rev112-1.20.0" excludeAll (
       ExclusionRule("com.google.guava", "guava-jdk5"),
       ExclusionRule("org.apache.httpcomponents", "httpclient")
@@ -43,7 +43,7 @@ object Dependencies {
     "com.typesafe.akka" %% "akka-http" % akkaHttpV,
     "com.typesafe.akka" %% "akka-testkit" % akkaV % "test",
     "com.typesafe.akka" %% "akka-slf4j" % akkaV,
-    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
+    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.6",
     "org.scalatest" %% "scalatest" % "3.2.19" % Test,
     "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % Test,
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",

automation/project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.5
+sbt.version=1.11.6

codegen_java/project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.5
+sbt.version=1.11.6

codegen_java/templates/libraries/okhttp-gson/build.sbt.mustache

@@ -7,7 +7,7 @@ lazy val root = (project in file(".")).
     Seq(organization := "org.broadinstitute.dsde.workbench",
     name := "sam-client",
     version := createVersion("{{artifactVersion}}"),
-    scalaVersion := "2.13.15",
+    scalaVersion := "2.13.16",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
     publishArtifact in (Compile, packageDoc) := false,

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.15_6_1.11.5_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.11.6_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.15_6_1.11.5_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.11.6_2.13.16 /working/docker/install.sh /working
     EXIT_CODE=$?
     set -e # Turn error detection back on for the rest of the script
 

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.15_6_1.11.5_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.11.6_2.13.16 /working/docker/clean_install.sh /working
 EXIT_CODE=$?
 
 if [ $EXIT_CODE != 0 ]; then

project/Dependencies.scala

@@ -4,11 +4,11 @@ object Dependencies {
   val akkaV = "2.6.19"
   val akkaHttpV = "10.2.9"
   val jacksonV = "2.17.0"
-  val scalaLoggingV = "3.9.2"
+  val scalaLoggingV = "3.9.6"
   val scalaTestV = "3.2.19"
-  val scalaCheckV = "1.18.1"
+  val scalaCheckV = "1.19.0"
   val scalikejdbcVersion = "3.4.2"
-  val postgresDriverVersion = "42.7.7"
+  val postgresDriverVersion = "42.7.8"
   val sentryVersion = "6.15.0"
 
   val workbenchLibV = "0c796e4" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date
@@ -20,8 +20,8 @@ object Dependencies {
   val workbenchNotificationsV = s"1.1-$workbenchLibV"
   val workbenchOauth2V = s"0.9-$workbenchLibV"
   val monocleVersion = "2.0.5"
-  val crlVersion = "1.2.39-SNAPSHOT"
-  val tclVersion = "1.1.50-SNAPSHOT"
+  val crlVersion = "1.2.41-SNAPSHOT"
+  val tclVersion = "1.1.53-SNAPSHOT"
   val slf4jVersion = "2.0.6"
 
   val excludeAkkaActor = ExclusionRule(organization = "com.typesafe.akka", name = "akka-actor_2.12")
@@ -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.1"
-  val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.18"
+  val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.19"
 
   val ravenLogback: ModuleID = "com.getsentry.raven" % "raven-logback" % "7.8.6"
   val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingV
@@ -65,8 +65,8 @@ object Dependencies {
   val akkaHttpTestKit: ModuleID = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % "test"
   val scalaCheck: ModuleID = "org.scalacheck" %% "scalacheck" % scalaCheckV % "test"
 
-  val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.9"
-  val nettyAll: ModuleID = "io.netty" % "netty-all" % "4.2.4.Final"
+  val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.10"
+  val nettyAll: ModuleID = "io.netty" % "netty-all" % "4.2.6.Final"
 
   val excludIoGrpc = ExclusionRule(organization = "io.grpc", name = "grpc-core")
   val ioGrpc: ModuleID = "io.grpc" % "grpc-core" % "1.75.0"
@@ -115,7 +115,7 @@ object Dependencies {
       excludeWorkbenchModel
     )
   val googleStorageLocal: ModuleID =
-    "com.google.cloud" % "google-cloud-nio" % "0.128.3" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs
+    "com.google.cloud" % "google-cloud-nio" % "0.128.5" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs
 
   val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.33.0"
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.5
+sbt.version=1.11.6