Merge branch 'sync-upstream' into 'master'

Ben Clouser · Ben Clouser · commit 686a00626863 · 2023-11-09T13:04:10.000Z
Sync upstream to our gitlab master

See merge request torizon-platform/ota-tuf!321
diff --git a/build.sbt b/build.sbt
@@ -127,7 +127,7 @@ lazy val cli = (project in file("cli"))
     topLevelDirectory := Some("uptane-sign"),
     executableScriptName := "uptane-sign",
     Universal / mappings += (file("cli/LICENSE") -> "docs/LICENSE"),
-    libraryDependencies += "com.typesafe" % "config" % "1.4.2" % Test)
+    libraryDependencies += "com.typesafe" % "config" % "1.4.3" % Test)
   .dependsOn(libtuf)
 
 lazy val ota_tuf = (project in file("."))
diff --git a/libtuf/build.sbt b/libtuf/build.sbt
@@ -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.0",
-    "com.azure" % "azure-identity" % "1.10.1"
+    "com.azure" % "azure-storage-blob" % "12.24.1",
+    "com.azure" % "azure-identity" % "1.11.0"
   )
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1,3 +1,3 @@
-sbt.version=1.9.6
+sbt.version=1.9.7
 
 
diff --git a/project/build.sbt b/project/build.sbt
@@ -1,5 +1,5 @@
 
-libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.565"
+libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.583"
 
 libraryDependencies += "org.apache.commons" % "commons-compress" % "1.24.0"
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ libraryDependencies ++= {`
`9`	`9`	`"com.softwaremill.sttp.client" %% "slf4j-backend" % "2.3.0",`
`10`	`10`	`"com.softwaremill.sttp.client" %% "async-http-client-backend-future" % "2.3.0",`
`11`	`11`	`"org.slf4j" % "slf4j-api" % "1.7.16" % "provided",`
`12`		`- "com.azure" % "azure-storage-blob" % "12.24.0",`
`13`		`- "com.azure" % "azure-identity" % "1.10.1"`
	`12`	`+ "com.azure" % "azure-storage-blob" % "12.24.1",`
	`13`	`+ "com.azure" % "azure-identity" % "1.11.0"`
`14`	`14`	`)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.565"`
	`2`	`+libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.583"`
`3`	`3`
`4`	`4`	`libraryDependencies += "org.apache.commons" % "commons-compress" % "1.24.0"`
`5`	`5`