Skip to content

Commit

Permalink
Merge branch 'merge-upstream' into 'master'
Browse files Browse the repository at this point in the history
Merge upstream

See merge request torizon-platform/ota-tuf!337
  • Loading branch information
Ben Clouser committed Jul 3, 2024
2 parents 29c35e6 + d004099 commit 0d6718d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ lazy val serverDependencies = libraryDependencies ++= {
"org.mariadb.jdbc" % "mariadb-java-client" % "3.4.0",
"com.beachape" %% "enumeratum" % enumeratumV,
"com.beachape" %% "enumeratum-circe" % enumeratumV,
"io.scalaland" %% "chimney" % "1.1.0"
"io.scalaland" %% "chimney" % "1.2.0"
)
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.751"
libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.753"

libraryDependencies += "org.apache.commons" % "commons-compress" % "1.26.2"
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.18")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.0")

0 comments on commit 0d6718d

Please sign in to comment.