From 0be582e37f499099c28049a5d2fb2057dd133d16 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:49:06 +0200 Subject: [PATCH 01/11] scala: 2.13.10 -> 2.13.11 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4f2ad0e..8f28267 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ organization := "net.ripe" name := "rpki-publication-server" -scalaVersion := "2.13.10" +scalaVersion := "2.13.11" scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8") From 4a4dfb618066ea2c13fbe89de4df01a659e98cda Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:50:13 +0200 Subject: [PATCH 02/11] akka: 2.8.0 -> 2.8.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8f28267..4d9e5b5 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ javaOptions in run ++= Seq("-Xmx2G") enablePlugins(JavaServerAppPackaging, UniversalDeployPlugin, GitVersioning) libraryDependencies ++= { - val akkaV = "2.8.0" + val akkaV = "2.8.3" val akkaHttp = "10.5.0" val macwire = "2.5.8" Seq( From bf5ad8e44f829521e7589ff0dde88e7d40f16e10 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:50:24 +0200 Subject: [PATCH 03/11] akka-http: 10.5.0 -> 10.5.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4d9e5b5..07fac8d 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ enablePlugins(JavaServerAppPackaging, UniversalDeployPlugin, GitVersioning) libraryDependencies ++= { val akkaV = "2.8.3" - val akkaHttp = "10.5.0" + val akkaHttp = "10.5.2" val macwire = "2.5.8" Seq( "com.typesafe.akka" %% "akka-http" % akkaHttp, From ba79ef69a614dbefd119de8a90489f5b8eb99411 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:53:15 +0200 Subject: [PATCH 04/11] scalatest: 3.2.14 -> 3.2.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 07fac8d..b9e5f92 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ libraryDependencies ++= { "com.typesafe.akka" %% "akka-testkit" % akkaV % "test", "com.typesafe.akka" %% "akka-slf4j" % akkaV, "com.typesafe" %% "ssl-config-core" % "0.6.1", - "org.scalatest" %% "scalatest" % "3.2.14" % "test", + "org.scalatest" %% "scalatest" % "3.2.16" % "test", "org.mockito" % "mockito-all" % "1.10.19" % "test", "com.fasterxml.woodstox" % "woodstox-core" % "6.4.0", "ch.qos.logback" % "logback-classic" % "1.4.3", From 69d29c5007a248c2fa6f6df0514c8cc4171aea43 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:53:42 +0200 Subject: [PATCH 05/11] Add akka-stream and scope akka-stream-testkit to test only --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b9e5f92..c9486f3 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,8 @@ libraryDependencies ++= { "com.typesafe.akka" %% "akka-http-core" % akkaHttp, "com.typesafe.akka" %% "akka-http-testkit" % akkaHttp % "test", "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttp, - "com.typesafe.akka" %% "akka-stream-testkit" % akkaV, + "com.typesafe.akka" %% "akka-stream" % akkaV, + "com.typesafe.akka" %% "akka-stream-testkit" % akkaV % "test", "com.typesafe.akka" %% "akka-testkit" % akkaV % "test", "com.typesafe.akka" %% "akka-slf4j" % akkaV, "com.typesafe" %% "ssl-config-core" % "0.6.1", From 01222791afe7d83456ad91288758cf288c018417 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 16:58:50 +0200 Subject: [PATCH 06/11] guava: 31.1 -> 32.1.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c9486f3..2bbbed0 100644 --- a/build.sbt +++ b/build.sbt @@ -49,7 +49,7 @@ libraryDependencies ++= { "com.softwaremill.macwire" %% "macrosakka" % macwire % "provided", "com.softwaremill.macwire" %% "util" % macwire % "provided", "com.softwaremill.macwire" %% "proxy" % macwire % "provided", - "com.google.guava" % "guava" % "31.1-jre", + "com.google.guava" % "guava" % "32.1.2-jre", "io.prometheus" % "simpleclient" % "0.16.0", "io.prometheus" % "simpleclient_common" % "0.16.0", "org.scala-lang.modules" %% "scala-xml" % "2.1.0", From 159995ae1606e452cb55e0ea4a8a6080779857e3 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 17:00:28 +0200 Subject: [PATCH 07/11] woodstox: 6.4.0 -> 6.5.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2bbbed0..863ac00 100644 --- a/build.sbt +++ b/build.sbt @@ -43,7 +43,7 @@ libraryDependencies ++= { "com.typesafe" %% "ssl-config-core" % "0.6.1", "org.scalatest" %% "scalatest" % "3.2.16" % "test", "org.mockito" % "mockito-all" % "1.10.19" % "test", - "com.fasterxml.woodstox" % "woodstox-core" % "6.4.0", + "com.fasterxml.woodstox" % "woodstox-core" % "6.5.1", "ch.qos.logback" % "logback-classic" % "1.4.3", "com.softwaremill.macwire" %% "macros" % macwire % "provided", "com.softwaremill.macwire" %% "macrosakka" % macwire % "provided", From 4a2f149cbb6f3177f450cf1204013c7c193122b3 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 17:01:02 +0200 Subject: [PATCH 08/11] logback-classic: 1.4.3 -> 1.4.8 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 863ac00..d619bc5 100644 --- a/build.sbt +++ b/build.sbt @@ -44,7 +44,7 @@ libraryDependencies ++= { "org.scalatest" %% "scalatest" % "3.2.16" % "test", "org.mockito" % "mockito-all" % "1.10.19" % "test", "com.fasterxml.woodstox" % "woodstox-core" % "6.5.1", - "ch.qos.logback" % "logback-classic" % "1.4.3", + "ch.qos.logback" % "logback-classic" % "1.4.8", "com.softwaremill.macwire" %% "macros" % macwire % "provided", "com.softwaremill.macwire" %% "macrosakka" % macwire % "provided", "com.softwaremill.macwire" %% "util" % macwire % "provided", From 0cda8ec661cada8ff846f8f31dcd79a2e5f30e56 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 17:01:58 +0200 Subject: [PATCH 09/11] postgresql: 42.5.1 -> 42.6.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d619bc5..0f44485 100644 --- a/build.sbt +++ b/build.sbt @@ -54,7 +54,7 @@ libraryDependencies ++= { "io.prometheus" % "simpleclient_common" % "0.16.0", "org.scala-lang.modules" %% "scala-xml" % "2.1.0", "org.scalikejdbc" %% "scalikejdbc" % "4.0.0", - "org.postgresql" % "postgresql" % "42.5.1", + "org.postgresql" % "postgresql" % "42.6.0", "org.json4s" %% "json4s-native" % "4.0.6", "org.flywaydb" % "flyway-core" % "9.4.0", "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4" From d22aa58b289a08963a6c3780acb083321e165451 Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 17:02:47 +0200 Subject: [PATCH 10/11] flyway-core: 9.4.0 -> 9.21.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0f44485..48b57d0 100644 --- a/build.sbt +++ b/build.sbt @@ -56,7 +56,7 @@ libraryDependencies ++= { "org.scalikejdbc" %% "scalikejdbc" % "4.0.0", "org.postgresql" % "postgresql" % "42.6.0", "org.json4s" %% "json4s-native" % "4.0.6", - "org.flywaydb" % "flyway-core" % "9.4.0", + "org.flywaydb" % "flyway-core" % "9.21.1", "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4" ) } From 80196cda177d9f7576a4dda920629b8680b28cfe Mon Sep 17 00:00:00 2001 From: Bart Bakker Date: Wed, 2 Aug 2023 17:03:34 +0200 Subject: [PATCH 11/11] scala-xml: 2.1.0 -> 2.2.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 48b57d0..1f82edf 100644 --- a/build.sbt +++ b/build.sbt @@ -52,7 +52,7 @@ libraryDependencies ++= { "com.google.guava" % "guava" % "32.1.2-jre", "io.prometheus" % "simpleclient" % "0.16.0", "io.prometheus" % "simpleclient_common" % "0.16.0", - "org.scala-lang.modules" %% "scala-xml" % "2.1.0", + "org.scala-lang.modules" %% "scala-xml" % "2.2.0", "org.scalikejdbc" %% "scalikejdbc" % "4.0.0", "org.postgresql" % "postgresql" % "42.6.0", "org.json4s" %% "json4s-native" % "4.0.6",