diff --git a/bag_unpacker/src/main/scala/weco/storage_service/bag_unpacker/storage/Unarchiver.scala b/bag_unpacker/src/main/scala/weco/storage_service/bag_unpacker/storage/Unarchiver.scala index ac40f40bbd..27d0080876 100644 --- a/bag_unpacker/src/main/scala/weco/storage_service/bag_unpacker/storage/Unarchiver.scala +++ b/bag_unpacker/src/main/scala/weco/storage_service/bag_unpacker/storage/Unarchiver.scala @@ -73,7 +73,7 @@ object Unarchiver { } override def next(): (ArchiveEntry, InputStream) = - (latest, new CloseShieldInputStream(archiveInputStream)) + (latest, CloseShieldInputStream.wrap(archiveInputStream)) } private def uncompress( diff --git a/build.sbt b/build.sbt index 12e8c30628..b5ae5ffdef 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,6 @@ import java.io.File import java.util.UUID -import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider - def setupProject( project: Project, folder: String, @@ -195,13 +193,3 @@ lazy val ingests_indexer = setupProject( localDependencies = Seq(display, indexer_common), description = "Indexes information about ingests in an Elasticsearch cluster" ) - -// AWS Credentials to read from S3 - -s3CredentialsProvider := { _ => - val builder = new STSAssumeRoleSessionCredentialsProvider.Builder( - "arn:aws:iam::760097843905:role/terraform-20210811133135108800000001", - UUID.randomUUID().toString - ) - builder.build() -} diff --git a/common/src/main/scala/weco/storage/services/azure/AzureRangedReader.scala b/common/src/main/scala/weco/storage/services/azure/AzureRangedReader.scala index ff93ca60eb..792f5347f0 100644 --- a/common/src/main/scala/weco/storage/services/azure/AzureRangedReader.scala +++ b/common/src/main/scala/weco/storage/services/azure/AzureRangedReader.scala @@ -35,7 +35,7 @@ class AzureRangedReader(implicit blobServiceClient: BlobServiceClient) } Try { - blobClient.downloadWithResponse( + blobClient.downloadStreamWithResponse( stream, blobRange, new DownloadRetryOptions, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 28b5055aef..7deca81e01 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object WellcomeDependencies { - val defaultVersion = "32.42.0" // This is automatically bumped by the scala-libs release process, do not edit this line manually + val defaultVersion = "32.42.1" // This is automatically bumped by the scala-libs release process, do not edit this line manually lazy val versions = new { val fixtures = defaultVersion @@ -80,19 +80,19 @@ object WellcomeDependencies { ) private def library(name: String, version: String): Seq[ModuleID] = Seq( - "weco" %% name % version, - "weco" %% name % version % "test" classifier "tests" + "org.wellcomecollection" %% name % version, + "org.wellcomecollection" %% name % version % "test" classifier "tests" ) } object ExternalDependencies { lazy val versions = new { - val azure = "12.7.0" + val azure = "12.25.3" val commonsCompress = "1.5" - val commonsIO = "2.6" - val mockito = "1.9.5" - val scalatest = "3.2.3" + val commonsIO = "2.16.1" + val mockito = "1.10.19" + val scalatest = "3.2.18" val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" @@ -107,7 +107,7 @@ object ExternalDependencies { // These are the "Common Runtime Libraries", which you're encouraged to use for // better performance. // See https://docs.aws.amazon.com/sdkref/latest/guide/common-runtime.html - val awsCrt = "0.29.16" + val awsCrt = "0.29.17" } val azureDependencies: Seq[ModuleID] = Seq( @@ -139,7 +139,7 @@ object ExternalDependencies { ) val nettyDependencies: Seq[ModuleID] = Seq( - "io.netty" % "netty-tcnative" % "2.0.61.Final" + "io.netty" % "netty-tcnative" % "2.0.65.Final" ) val awsTransferManagerDependencies: Seq[ModuleID] = Seq( diff --git a/project/build.properties b/project/build.properties index abbbce5da4..04267b14af 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/project/build.sbt b/project/build.sbt index 089c89e3d7..8f50479761 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1 +1 @@ -scalaVersion := "2.12.15" +scalaVersion := "2.12.19" diff --git a/project/plugins.sbt b/project/plugins.sbt index 87771a49bf..b0b6c59482 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,5 @@ -addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5") -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0") -addDependencyTreePlugin \ No newline at end of file +addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16") +addDependencyTreePlugin