Merge branch 'merge-upstream' into 'master'

Merge upstream into toradex master

See merge request torizon-platform/ota-tuf!341

build.sbt

@@ -14,7 +14,7 @@ lazy val commonDeps = libraryDependencies ++= {
   val scalaTestV = "3.2.19"
   lazy val catsV = "2.12.0"
   lazy val akkaHttpV = "10.5.2"
-  lazy val enumeratumV = "1.7.3"
+  lazy val enumeratumV = "1.7.4"
 
   Seq(
     "org.scala-lang.modules" %% "scala-async" % "1.0.1",
@@ -32,7 +32,7 @@ lazy val commonDeps = libraryDependencies ++= {
 lazy val serverDependencies = libraryDependencies ++= {
   lazy val akkaV = "2.8.5"
   lazy val akkaHttpV = "10.5.2"
-  lazy val enumeratumV = "1.7.3"
+  lazy val enumeratumV = "1.7.4"
 
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaV,
@@ -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.2.0"
+    "io.scalaland" %% "chimney" % "1.3.0"
   )
 }
 

cli/src/main/scala/com/advancedtelematic/tuf/cli/Cli.scala

@@ -79,7 +79,7 @@ case class Config(command: Command,
                   reposerverUrl: Option[URI] = None,
                   verbose: Boolean = false,
                   inplace: Boolean = false,
-                  customMeta: Json = Json.Null)
+                  customMeta: Json = Json.obj())
 
 object Cli extends App with VersionInfo {
 
@@ -146,7 +146,6 @@ object Cli extends App with VersionInfo {
   lazy val customMetaOpts: OptionParser[Config] => OptionDef[_, Config] = { parser =>
     parser
       .opt[Json]("customMeta")
-      .required()
       .toConfigParam(Symbol("customMeta"))
       .validate { json =>
         val badFields = List("name", "version", "hardwareIds", "targetFormat", "uri", "cliUploaded")

project/build.properties

@@ -1,3 +1,3 @@
-sbt.version=1.10.0
+sbt.version=1.10.1
 
 

project/build.sbt

@@ -1,3 +1,3 @@
-libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.753"
+libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.760"
 
 libraryDependencies += "org.apache.commons" % "commons-compress" % "1.26.2"

project/plugins.sbt

@@ -1,7 +1,7 @@
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.18")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
 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.11.0")