From ab1c178e0e69270caae5e1826e495d19c8d967ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 5 Nov 2025 14:48:10 +0100 Subject: [PATCH 1/2] bump: Akka 25.10.0 --- .../project/Dependencies.scala | 12 ++++++------ .../project/Dependencies.scala | 8 ++++---- .../project/Dependencies.scala | 16 ++++++++-------- .../project/Dependencies.scala | 8 ++++---- alpakka-sample-jms/project/Dependencies.scala | 10 +++++----- .../project/Dependencies.scala | 14 +++++++------- .../project/Dependencies.scala | 8 ++++---- alpakka-sample-mqtt-http-to-s3-java/build.sbt | 12 ++++++------ .../docs/src/main/paradox/example.md | 2 +- .../project/Dependencies.scala | 10 +++++----- .../project/Dependencies.scala | 8 ++++---- alpakka-sample-sqs-java/build.sbt | 10 +++++----- docs/build.sbt | 2 +- 13 files changed, 60 insertions(+), 60 deletions(-) diff --git a/alpakka-sample-file-to-elasticsearch/project/Dependencies.scala b/alpakka-sample-file-to-elasticsearch/project/Dependencies.scala index e5572f7..4918a31 100644 --- a/alpakka-sample-file-to-elasticsearch/project/Dependencies.scala +++ b/alpakka-sample-file-to-elasticsearch/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps val dependencies = List( // #deps @@ -18,8 +18,8 @@ object Dependencies { // for JSON in Scala "io.spray" %% "spray-json" % "1.3.6", // for JSON in Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.4", // Logging "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, "ch.qos.logback" % "logback-classic" % "1.5.18", diff --git a/alpakka-sample-ftp-to-file/project/Dependencies.scala b/alpakka-sample-ftp-to-file/project/Dependencies.scala index 624aa80..2c431c9 100644 --- a/alpakka-sample-ftp-to-file/project/Dependencies.scala +++ b/alpakka-sample-ftp-to-file/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps diff --git a/alpakka-sample-http-csv-to-kafka/project/Dependencies.scala b/alpakka-sample-http-csv-to-kafka/project/Dependencies.scala index e964bc6..ff6216a 100644 --- a/alpakka-sample-http-csv-to-kafka/project/Dependencies.scala +++ b/alpakka-sample-http-csv-to-kafka/project/Dependencies.scala @@ -1,14 +1,14 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #dependencies val ScalaTestVersion = "3.1.4" - val AkkaVersion = "2.10.5" - val AkkaHttpVersion = "10.7.1" - val AlpakkaVersion = "9.0.2" - val AlpakkaKafkaVersion = "7.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AkkaHttpVersion = "10.7.3" + val AlpakkaVersion = "10.0.0" + val AlpakkaKafkaVersion = "8.0.0" + val AkkaDiagnosticsVersion = "2.2.2" val dependencies = List( "com.lightbend.akka" %% "akka-stream-alpakka-csv" % AlpakkaVersion, @@ -20,8 +20,8 @@ object Dependencies { // Used from Scala "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion, // Used from Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.4", "org.testcontainers" % "kafka" % "1.14.3", diff --git a/alpakka-sample-jdbc-to-elasticsearch/project/Dependencies.scala b/alpakka-sample-jdbc-to-elasticsearch/project/Dependencies.scala index a05e84c..5ea49cd 100644 --- a/alpakka-sample-jdbc-to-elasticsearch/project/Dependencies.scala +++ b/alpakka-sample-jdbc-to-elasticsearch/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps diff --git a/alpakka-sample-jms/project/Dependencies.scala b/alpakka-sample-jms/project/Dependencies.scala index fe00174..35a6ec2 100644 --- a/alpakka-sample-jms/project/Dependencies.scala +++ b/alpakka-sample-jms/project/Dependencies.scala @@ -1,12 +1,12 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AkkaHttpVersion = "10.7.1" - val AlpakkaVersion = "9.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AkkaHttpVersion = "10.7.3" + val AlpakkaVersion = "10.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps diff --git a/alpakka-sample-kafka-to-elasticsearch/project/Dependencies.scala b/alpakka-sample-kafka-to-elasticsearch/project/Dependencies.scala index 583761f..26cd7de 100644 --- a/alpakka-sample-kafka-to-elasticsearch/project/Dependencies.scala +++ b/alpakka-sample-kafka-to-elasticsearch/project/Dependencies.scala @@ -1,12 +1,12 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AlpakkaKafkaVersion = "7.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AlpakkaKafkaVersion = "8.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps @@ -21,8 +21,8 @@ object Dependencies { // for JSON in Scala "io.spray" %% "spray-json" % "1.3.6", // for JSON in Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.4", // Logging "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, "ch.qos.logback" % "logback-classic" % "1.5.18", diff --git a/alpakka-sample-kafka-to-websocket-clients/project/Dependencies.scala b/alpakka-sample-kafka-to-websocket-clients/project/Dependencies.scala index 0de6017..db722fd 100644 --- a/alpakka-sample-kafka-to-websocket-clients/project/Dependencies.scala +++ b/alpakka-sample-kafka-to-websocket-clients/project/Dependencies.scala @@ -3,10 +3,10 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.10.5" - val AkkaHttpVersion = "10.7.1" - val AlpakkaKafkaVersion = "7.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AkkaHttpVersion = "10.7.3" + val AlpakkaKafkaVersion = "8.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps val dependencies = List( // #deps diff --git a/alpakka-sample-mqtt-http-to-s3-java/build.sbt b/alpakka-sample-mqtt-http-to-s3-java/build.sbt index 60955bd..e82ca64 100644 --- a/alpakka-sample-mqtt-http-to-s3-java/build.sbt +++ b/alpakka-sample-mqtt-http-to-s3-java/build.sbt @@ -1,11 +1,11 @@ organization := "com.lightbend.akka.samples" name := "alpakka-samples-mqtt-http-to-s3-java" -ThisBuild / scalaVersion := "2.13.15" +ThisBuild / scalaVersion := "2.13.17" -val AkkaVersion = "2.10.5" -val AkkaHttpVersion = "10.7.1" -val AkkaDiagnosticsVersion = "2.2.1" +val AkkaVersion = "2.10.11" +val AkkaHttpVersion = "10.7.3" +val AkkaDiagnosticsVersion = "2.2.2" resolvers += "Akka library repository".at("https://repo.akka.io/maven") @@ -18,8 +18,8 @@ libraryDependencies ++= Seq( "com.lightbend.akka" %% "akka-diagnostics" % AkkaDiagnosticsVersion, "com.lightbend.akka" %% "akka-stream-alpakka-mqtt" % "3.0.4", "com.lightbend.akka" %% "akka-stream-alpakka-s3" % "3.0.4", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.4", "ch.qos.logback" % "logback-classic" % "1.5.18" ) diff --git a/alpakka-sample-mqtt-to-kafka/docs/src/main/paradox/example.md b/alpakka-sample-mqtt-to-kafka/docs/src/main/paradox/example.md index 8088a41..d998be5 100644 --- a/alpakka-sample-mqtt-to-kafka/docs/src/main/paradox/example.md +++ b/alpakka-sample-mqtt-to-kafka/docs/src/main/paradox/example.md @@ -31,7 +31,7 @@ To use Java 8 time types (`Instant`) with Jackson, extra dependencies are requir version1=2.10.0 group2=com.fasterxml.jackson.datatype artifact2=jackson-datatype-jsr310 - version2=2.10.0 + version2.2.20.0 group3=com.fasterxml.jackson.module artifact3=jackson-module-scala_$scala.binary.version$ version3=2.10.0 diff --git a/alpakka-sample-mqtt-to-kafka/project/Dependencies.scala b/alpakka-sample-mqtt-to-kafka/project/Dependencies.scala index 7ee9c41..1f2aa8a 100644 --- a/alpakka-sample-mqtt-to-kafka/project/Dependencies.scala +++ b/alpakka-sample-mqtt-to-kafka/project/Dependencies.scala @@ -1,12 +1,12 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AlpakkaKafkaVersion = "7.0.2" - val JacksonDatabindVersion = "2.18.3" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AlpakkaKafkaVersion = "8.0.0" + val JacksonDatabindVersion = "2.18.4" // #deps diff --git a/alpakka-sample-rotate-logs-to-ftp/project/Dependencies.scala b/alpakka-sample-rotate-logs-to-ftp/project/Dependencies.scala index 0ae86b0..513cff9 100644 --- a/alpakka-sample-rotate-logs-to-ftp/project/Dependencies.scala +++ b/alpakka-sample-rotate-logs-to-ftp/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.15" + val scalaVer = "2.13.17" // #deps - val AkkaVersion = "2.10.5" - val AlpakkaVersion = "9.0.2" - val AkkaDiagnosticsVersion = "2.2.1" + val AkkaVersion = "2.10.11" + val AlpakkaVersion = "10.0.0" + val AkkaDiagnosticsVersion = "2.2.2" // #deps diff --git a/alpakka-sample-sqs-java/build.sbt b/alpakka-sample-sqs-java/build.sbt index a40ab37..4de15a2 100644 --- a/alpakka-sample-sqs-java/build.sbt +++ b/alpakka-sample-sqs-java/build.sbt @@ -1,12 +1,12 @@ organization := "com.lightbend.alpakka.samples" name := "alpakka-samples-sqs-java" -ThisBuild / scalaVersion := "2.13.15" +ThisBuild / scalaVersion := "2.13.17" -val AkkaVersion = "2.10.5" -val AlpakkaVersion = "9.0.2" -val AkkaDiagnosticsVersion = "2.2.1" -val JacksonCoreVersion = "2.18.3" +val AkkaVersion = "2.10.11" +val AlpakkaVersion = "10.0.0" +val AkkaDiagnosticsVersion = "2.2.2" +val JacksonCoreVersion = "2.18.4" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/docs/build.sbt b/docs/build.sbt index c7979bb..3c46e21 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -1,5 +1,5 @@ -ThisBuild / scalaVersion := "2.13.15" +ThisBuild / scalaVersion := "2.13.17" enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PublishRsyncPlugin) From 088fe8e0ccf897688250f1829f164853edbd896c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 5 Nov 2025 14:57:26 +0100 Subject: [PATCH 2/2] token resolver stuff in ci --- .github/workflows/compile.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index aa2b512..7dab90d 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -12,11 +12,23 @@ permissions: jobs: documentation: name: Documentation with Paradox - runs-on: ubuntu-22.04 + runs-on: Akka-Default env: JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: + - name: Checkout Global Scripts + uses: actions/checkout@v4 + with: + repository: akka/github-actions-scripts + path: scripts + fetch-depth: 0 + + - name: Setup global resolver + run: | + chmod +x ./scripts/setup_global_resolver.sh + ./scripts/setup_global_resolver.sh + - name: Checkout # https://github.com/actions/checkout/releases # v4.1.1 @@ -41,7 +53,7 @@ jobs: # run: cs launch net.runne::site-link-validator:0.2.2 -- scripts/link-validator.conf samples: - runs-on: ubuntu-22.04 + runs-on: Akka-Default strategy: fail-fast: false @@ -63,6 +75,18 @@ jobs: JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: + - name: Checkout Global Scripts + uses: actions/checkout@v4 + with: + repository: akka/github-actions-scripts + path: scripts + fetch-depth: 0 + + - name: Setup global resolver + run: | + chmod +x ./scripts/setup_global_resolver.sh + ./scripts/setup_global_resolver.sh + - name: Checkout uses: actions/checkout@v2