From cc9e7c99f65259c175996cf73886bf63fa39d547 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 19 Sep 2024 08:32:13 +0000 Subject: [PATCH 01/12] Update opentelemetry-aws-xray to 1.39.0 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 38ffb350c..cc941e37d 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ libraryDependencies ++= Seq( "io.opentelemetry" % "opentelemetry-sdk" % "1.42.1", "io.opentelemetry" % "opentelemetry-extension-aws" % "1.20.1", "io.opentelemetry" % "opentelemetry-sdk-extension-aws" % "1.19.0", - "io.opentelemetry.contrib" % "opentelemetry-aws-xray" % "1.38.0", + "io.opentelemetry.contrib" % "opentelemetry-aws-xray" % "1.39.0", "io.opentelemetry.contrib" % "opentelemetry-aws-xray-propagator" % "1.22.0-alpha", "com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test, "org.mockito" % "mockito-core" % "5.13.0" % Test, From 41fb78e7760ebb838ff01598f0be658d0d17a879 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 19 Sep 2024 08:32:20 +0000 Subject: [PATCH 02/12] Update fastexcel, fastexcel-reader to 0.18.4 in scala-steward-dependencies --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 38ffb350c..0a00ba564 100644 --- a/build.sbt +++ b/build.sbt @@ -57,8 +57,8 @@ scalacOptions ++= Seq("-language:implicitConversions") libraryDependencies += play.sbt.PlayImport.cacheApi libraryDependencies += "com.github.karelcemus" %% "play-redis" % "5.0.0" -libraryDependencies += "org.dhatim" % "fastexcel" % "0.18.3" -libraryDependencies += "org.dhatim" % "fastexcel-reader" % "0.18.3" +libraryDependencies += "org.dhatim" % "fastexcel" % "0.18.4" +libraryDependencies += "org.dhatim" % "fastexcel-reader" % "0.18.4" excludeDependencies ++= Seq( ExclusionRule(organization = "com.typesafe.akka"), From 69797eaed37ecff83b11cb1c5d1f98bce82e9afc Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 19 Sep 2024 08:32:30 +0000 Subject: [PATCH 03/12] Update s3-utils, sns-utils to 0.1.206 in scala-steward-dependencies --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 38ffb350c..3bf5e7a6f 100644 --- a/build.sbt +++ b/build.sbt @@ -31,8 +31,8 @@ libraryDependencies ++= Seq( "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.55", - "uk.gov.nationalarchives" %% "s3-utils" % "0.1.205", - "uk.gov.nationalarchives" %% "sns-utils" % "0.1.205", + "uk.gov.nationalarchives" %% "s3-utils" % "0.1.206", + "uk.gov.nationalarchives" %% "sns-utils" % "0.1.206", "ch.qos.logback" % "logback-classic" % "1.5.8", ws, "io.opentelemetry" % "opentelemetry-api" % "1.42.1", From b7abeddc020254dc7a1817b06acb9849f592fd30 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Thu, 19 Sep 2024 08:32:34 +0000 Subject: [PATCH 04/12] Update tdr-graphql-client to 0.0.181 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 38ffb350c..9db554cea 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ libraryDependencies ++= Seq( "com.softwaremill.sttp.client" %% "core" % sttpVersion, "com.softwaremill.sttp.client" %% "circe" % sttpVersion, "com.softwaremill.sttp.client" %% "async-http-client-backend-future" % sttpVersion, - "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.180", + "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.181", "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.55", From db2294b6cdc102970e872d6330b502f3eb0370ef Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sun, 22 Sep 2024 08:27:56 +0000 Subject: [PATCH 05/12] Update s3-utils, sns-utils to 0.1.207 in scala-steward-dependencies --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c42238e59..07f814644 100644 --- a/build.sbt +++ b/build.sbt @@ -31,8 +31,8 @@ libraryDependencies ++= Seq( "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.55", - "uk.gov.nationalarchives" %% "s3-utils" % "0.1.206", - "uk.gov.nationalarchives" %% "sns-utils" % "0.1.206", + "uk.gov.nationalarchives" %% "s3-utils" % "0.1.207", + "uk.gov.nationalarchives" %% "sns-utils" % "0.1.207", "ch.qos.logback" % "logback-classic" % "1.5.8", ws, "io.opentelemetry" % "opentelemetry-api" % "1.42.1", From f5476c2a1017b034c40b83200f198d971aa896d6 Mon Sep 17 00:00:00 2001 From: ian-hoyle Date: Mon, 23 Sep 2024 11:53:55 +0100 Subject: [PATCH 06/12] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 07f814644..6ae9f0572 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ libraryDependencies ++= Seq( "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.181", "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", - "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.55", + "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.56", "uk.gov.nationalarchives" %% "s3-utils" % "0.1.207", "uk.gov.nationalarchives" %% "sns-utils" % "0.1.207", "ch.qos.logback" % "logback-classic" % "1.5.8", From f212f5e7fb8d65362673a3ef689d735a135f0f6a Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Wed, 25 Sep 2024 08:30:35 +0000 Subject: [PATCH 07/12] Update tdr-auth-utils to 0.0.214 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6ae9f0572..c167f84bd 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ libraryDependencies ++= Seq( "com.softwaremill.sttp.client" %% "circe" % sttpVersion, "com.softwaremill.sttp.client" %% "async-http-client-backend-future" % sttpVersion, "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.181", - "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", + "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.214", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.56", "uk.gov.nationalarchives" %% "s3-utils" % "0.1.207", From 1336ff56f27a1ca5cbab035dfb28806af78226fc Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Wed, 25 Sep 2024 08:30:42 +0000 Subject: [PATCH 08/12] Update tdr-metadata-validation to 0.0.60 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6ae9f0572..ddbee8b64 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ libraryDependencies ++= Seq( "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.181", "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.213", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", - "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.56", + "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.60", "uk.gov.nationalarchives" %% "s3-utils" % "0.1.207", "uk.gov.nationalarchives" %% "sns-utils" % "0.1.207", "ch.qos.logback" % "logback-classic" % "1.5.8", From 46c4dd5b00b6bdd170f1ff21df5747cc5ac26139 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sat, 28 Sep 2024 08:26:33 +0000 Subject: [PATCH 09/12] Update mockito-core to 5.14.0 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b7f4c4e19..5f2a7d04f 100644 --- a/build.sbt +++ b/build.sbt @@ -43,7 +43,7 @@ libraryDependencies ++= Seq( "io.opentelemetry.contrib" % "opentelemetry-aws-xray" % "1.39.0", "io.opentelemetry.contrib" % "opentelemetry-aws-xray-propagator" % "1.22.0-alpha", "com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test, - "org.mockito" % "mockito-core" % "5.13.0" % Test, + "org.mockito" % "mockito-core" % "5.14.0" % Test, "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % Test ) libraryDependencies += "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" From 425c804d91c478943b21810abcedf49586f25bcd Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sat, 28 Sep 2024 08:26:40 +0000 Subject: [PATCH 10/12] Update scala-library to 2.13.15 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b7f4c4e19..c37ee4fb5 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala) watchSources ++= (baseDirectory.value / "npm/src" ** "*").get -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" libraryDependencies += guice libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test From f6c1ed0a8bee8347b1bfd1e5c06d47307e315123 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sat, 28 Sep 2024 08:26:43 +0000 Subject: [PATCH 11/12] Update s3-utils, sns-utils to 0.1.208 in scala-steward-dependencies --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index b7f4c4e19..41df3c88c 100644 --- a/build.sbt +++ b/build.sbt @@ -31,8 +31,8 @@ libraryDependencies ++= Seq( "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.214", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.60", - "uk.gov.nationalarchives" %% "s3-utils" % "0.1.207", - "uk.gov.nationalarchives" %% "sns-utils" % "0.1.207", + "uk.gov.nationalarchives" %% "s3-utils" % "0.1.208", + "uk.gov.nationalarchives" %% "sns-utils" % "0.1.208", "ch.qos.logback" % "logback-classic" % "1.5.8", ws, "io.opentelemetry" % "opentelemetry-api" % "1.42.1", From d7068f2833b7c511ce8ba39f7872661bfbbe7a09 Mon Sep 17 00:00:00 2001 From: tna-digital-archiving-jenkins Date: Sat, 28 Sep 2024 08:26:47 +0000 Subject: [PATCH 12/12] Update tdr-graphql-client to 0.0.183 in scala-steward-dependencies --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b7f4c4e19..6607fe784 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ libraryDependencies ++= Seq( "com.softwaremill.sttp.client" %% "core" % sttpVersion, "com.softwaremill.sttp.client" %% "circe" % sttpVersion, "com.softwaremill.sttp.client" %% "async-http-client-backend-future" % sttpVersion, - "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.181", + "uk.gov.nationalarchives" %% "tdr-graphql-client" % "0.0.183", "uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.214", "uk.gov.nationalarchives" %% "tdr-generated-graphql" % "0.0.387", "uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.60",