diff --git a/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala b/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala index 2c08024f..c0b3557d 100644 --- a/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala +++ b/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala @@ -6,7 +6,7 @@ import io.circe.syntax._ import io.circe.{Json, JsonObject, Printer} import software.amazon.awssdk.core.sync.RequestBody import software.amazon.awssdk.services.s3.S3Client -import software.amazon.awssdk.services.s3.model.{CopyObjectRequest, ListObjectsV2Request, PutObjectRequest, S3Object} +import software.amazon.awssdk.services.s3.model.{CopyObjectRequest, ListObjectsV2Request, PutObjectRequest, S3Object, Tagging, TaggingDirective} import uk.gov.nationalarchives.`export`.Main.Config import uk.gov.nationalarchives.`export`.MetadataUtils.{ConsignmentType, Judgment, Metadata, Standard} import uk.gov.nationalarchives.`export`.S3Utils.FileOutput @@ -52,6 +52,8 @@ class S3Utils(config: Config, s3Client: S3Client) { .sourceBucket(config.s3.cleanBucket) .destinationKey(destinationKey) .destinationBucket(destinationBucket) + .taggingDirective(TaggingDirective.REPLACE) + .tagging(Tagging.builder().build()) .build() s3Client.copyObject(copyRequest) val series = consignmentMetadata.find(_.propertyName == "Series").map(_.value) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 248bd17f..47b11be2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,30 +1,30 @@ import sbt._ object Dependencies { - private val githubPureConfigVersion = "0.17.7" - private val keycloakVersion = "26.0.4" + private val githubPureConfigVersion = "0.17.8" + private val keycloakVersion = "26.0.7" private val log4CatsVersion = "2.7.0" private val mockitoScalaVersion = "1.17.37" private val monovoreDeclineVersion = "2.4.1" - private val awsUtilsVersion = "0.1.216" + private val awsUtilsVersion = "0.1.225" private val doobieVersion = "1.0.0-RC6" private val testContainersVersion = "0.41.4" - lazy val authUtils = "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.218" + lazy val authUtils = "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.222" lazy val awsRds = "software.amazon.awssdk" % "rds" % "2.26.27" - lazy val generatedGraphql = "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.391" + lazy val generatedGraphql = "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.396" lazy val s3Utils = "uk.gov.nationalarchives" %% "s3-utils" % awsUtilsVersion lazy val stepFunctionUtils = "uk.gov.nationalarchives" %% "stepfunction-utils" % awsUtilsVersion lazy val snsUtils = "uk.gov.nationalarchives" %% "sns-utils" % awsUtilsVersion lazy val bagit = "gov.loc" % "bagit" % "5.2.0" - lazy val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.5" - lazy val catsEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.5" + lazy val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.7" + lazy val catsEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.7" lazy val decline = "com.monovore" %% "decline" % monovoreDeclineVersion lazy val declineEffect = "com.monovore" %% "decline-effect" % monovoreDeclineVersion lazy val doobie = "org.tpolecat" %% "doobie-core" % doobieVersion lazy val doobiePostgres = "org.tpolecat" %% "doobie-postgres" % doobieVersion lazy val postgres = "org.postgresql" % "postgresql" % "42.7.4" - lazy val graphqlClient = "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.191" + lazy val graphqlClient = "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.196" lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" lazy val scalaCsv = "com.github.tototoshi" %% "scala-csv" % "2.0.0" lazy val log4cats = "org.typelevel" %% "log4cats-core" % log4CatsVersion @@ -38,5 +38,5 @@ object Dependencies { lazy val keycloakAdminClient = "org.keycloak" % "keycloak-admin-client" % keycloakVersion lazy val testContainers = "com.dimafeng" %% "testcontainers-scala-scalatest" % testContainersVersion lazy val testContainersPostgres = "com.dimafeng" %% "testcontainers-scala-postgresql" % testContainersVersion - lazy val wiremock = "org.wiremock" % "wiremock" % "3.9.1" + lazy val wiremock = "org.wiremock" % "wiremock" % "3.10.0" } diff --git a/project/build.properties b/project/build.properties index bc739060..e88a0d81 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.3 +sbt.version=1.10.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2b297af8..69551e50 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") libraryDependencies += "com.sun.activation" % "javax.activation" % "1.2.0" addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") diff --git a/version.sbt b/version.sbt index 6ea52d0d..0cb852c1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.0.448-SNAPSHOT" +ThisBuild / version := "0.0.452-SNAPSHOT"