Skip to content

Commit

Permalink
Merge remote-tracking branch 'uptane/master' into trx-master
Browse files Browse the repository at this point in the history
  • Loading branch information
simao committed Feb 29, 2024
2 parents 2b460c3 + 0cc7346 commit becd24a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ lazy val commonConfigs = Seq(ItTest, UnitTest)
val libatsVersion = "2.6.5"

lazy val commonDeps = libraryDependencies ++= {
val scalaTestV = "3.2.17"
val scalaTestV = "3.2.18"
lazy val catsV = "2.10.0"

Seq(
Expand Down Expand Up @@ -44,7 +44,7 @@ lazy val serverDependencies = libraryDependencies ++= {
"io.github.uptane" %% "libats-metrics-prometheus" % libatsVersion,
"io.github.uptane" %% "libats-slick" % libatsVersion,
"io.github.uptane" %% "libats-logging" % libatsVersion,
"org.mariadb.jdbc" % "mariadb-java-client" % "3.2.0"
"org.mariadb.jdbc" % "mariadb-java-client" % "3.3.3"
)
}

Expand Down
2 changes: 1 addition & 1 deletion cli/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

== Obtaining the binary

Binaries are compiled for each push to `master` and stored in https://tuf-cli-releases.ota.here.com/index.html[s3].
Binaries are compiled for with each release, and are available on the https://github.com/uptane/ota-tuf/releases/[github releases page].

Download the archive file, unpack and run:

Expand Down
4 changes: 2 additions & 2 deletions cli/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0"

libraryDependencies += "org.slf4j" % "slf4j-api" % "2.0.9"
libraryDependencies += "org.slf4j" % "slf4j-api" % "2.0.12"

libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.4.11"
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.0"

libraryDependencies += "io.circe" %% "circe-generic-extras" % "0.14.3"

Expand Down
6 changes: 3 additions & 3 deletions libtuf/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
libraryDependencies ++= {
val bouncyCastleV = "1.76"
val bouncyCastleV = "1.77"

Seq(
"org.bouncycastle" % "bcprov-jdk18on" % bouncyCastleV,
Expand All @@ -9,7 +9,7 @@ libraryDependencies ++= {
"com.softwaremill.sttp.client" %% "slf4j-backend" % "2.3.0",
"com.softwaremill.sttp.client" %% "async-http-client-backend-future" % "2.3.0",
"org.slf4j" % "slf4j-api" % "1.7.16" % "provided",
"com.azure" % "azure-storage-blob" % "12.24.1",
"com.azure" % "azure-identity" % "1.11.0"
"com.azure" % "azure-storage-blob" % "12.25.2",
"com.azure" % "azure-identity" % "1.11.2"
)
}
4 changes: 2 additions & 2 deletions project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.583"
libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.668"

libraryDependencies += "org.apache.commons" % "commons-compress" % "1.24.0"
libraryDependencies += "org.apache.commons" % "commons-compress" % "1.26.0"

6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.11")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.15")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")

0 comments on commit becd24a

Please sign in to comment.