From 2c3cda8d7d6b4a29629074b336dd153076e459ba Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 15 Mar 2024 21:53:49 +0100 Subject: [PATCH] upgrade deps (#31) --- docs/build.sbt | 4 +--- docs/project/build.properties | 2 +- docs/project/plugins.sbt | 8 +++----- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- pekko-connectors-sample-jms/project/Dependencies.scala | 2 +- pekko-connectors-sample-jms/project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- .../project/Dependencies.scala | 2 +- .../project/build.properties | 2 +- pekko-connectors-sample-sqs-java/build.sbt | 2 +- pekko-connectors-sample-sqs-java/project/build.properties | 2 +- 25 files changed, 27 insertions(+), 31 deletions(-) diff --git a/docs/build.sbt b/docs/build.sbt index 9d7c8b4..96a2bdd 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -1,7 +1,5 @@ -ThisBuild / scalaVersion := "2.13.12" - -resolvers += Resolver.ApacheMavenSnapshotsRepo +ThisBuild / scalaVersion := "2.13.13" enablePlugins(ParadoxPlugin, PekkoParadoxPlugin, ParadoxSitePlugin) diff --git a/docs/project/build.properties b/docs/project/build.properties index e8a1e24..04267b1 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 947c9ad..21b0076 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -1,7 +1,5 @@ -dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.2.0" libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.6" -resolvers += Resolver.ApacheMavenSnapshotsRepo - -addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0+8-1d350942-SNAPSHOT") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") +addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1") +addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").excludeAll( + "com.lightbend.paradox", "sbt-paradox")) diff --git a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala index 252f731..b8fdaeb 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-file-to-elasticsearch/project/build.properties b/pekko-connectors-sample-file-to-elasticsearch/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-file-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala index af13930..74e827e 100644 --- a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala +++ b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-ftp-to-file/project/build.properties b/pekko-connectors-sample-ftp-to-file/project/build.properties index d928255..b089b60 100644 --- a/pekko-connectors-sample-ftp-to-file/project/build.properties +++ b/pekko-connectors-sample-ftp-to-file/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala b/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala index f7f358b..bcf71a0 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #dependencies val ScalaTestVersion = "3.2.18" val PekkoVersion = "1.0.2" diff --git a/pekko-connectors-sample-http-csv-to-kafka/project/build.properties b/pekko-connectors-sample-http-csv-to-kafka/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/build.properties +++ b/pekko-connectors-sample-http-csv-to-kafka/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala index de8d210..b7a0f21 100644 --- a/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" diff --git a/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties b/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-jms/project/Dependencies.scala b/pekko-connectors-sample-jms/project/Dependencies.scala index 7ca2f88..843a55a 100644 --- a/pekko-connectors-sample-jms/project/Dependencies.scala +++ b/pekko-connectors-sample-jms/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoHttpVersion = "1.0.1" diff --git a/pekko-connectors-sample-jms/project/build.properties b/pekko-connectors-sample-jms/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-jms/project/build.properties +++ b/pekko-connectors-sample-jms/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala index c7039fb..4722f7f 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties b/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala b/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala index 8774f0c..93033ec 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsKafkaVersion = "1.0.0" diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties b/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties +++ b/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt b/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt index 81347ef..8ba9378 100644 --- a/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt +++ b/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt @@ -1,7 +1,7 @@ organization := "org.apache.pekko" name := "pekko-connectors-samples-mqtt-http-to-s3-java" -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.13" val PekkoVersion = "1.0.2" val PekkoHttpVersion = "1.0.1" diff --git a/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties b/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties +++ b/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala index e3950d0..9e78633 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-mqtt-to-kafka/project/build.properties b/pekko-connectors-sample-mqtt-to-kafka/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/project/build.properties +++ b/pekko-connectors-sample-mqtt-to-kafka/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala b/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala index 12eb24a..03a7f62 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala +++ b/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala @@ -1,7 +1,7 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.12" + val scalaVer = "2.13.13" // #deps val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties b/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties +++ b/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-connectors-sample-sqs-java/build.sbt b/pekko-connectors-sample-sqs-java/build.sbt index 8238fdc..e7a1ee5 100644 --- a/pekko-connectors-sample-sqs-java/build.sbt +++ b/pekko-connectors-sample-sqs-java/build.sbt @@ -1,7 +1,7 @@ organization := "org.apache.pekko" name := "pekko-connectors-samples-sqs-java" -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.13" val PekkoVersion = "1.0.2" val PekkoConnectorsVersion = "1.0.2" diff --git a/pekko-connectors-sample-sqs-java/project/build.properties b/pekko-connectors-sample-sqs-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-connectors-sample-sqs-java/project/build.properties +++ b/pekko-connectors-sample-sqs-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9