From 6e2213057541cfb46f0541d6a83c82eb0774002f Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 2 Nov 2023 16:15:04 +0100 Subject: [PATCH] bump: Akka 23.10.0 dependencies (#291) * not updating 3 samples because they use cassandra-launcher and therefore require some more work * akka-sample-persistence-dc-java * akka-sample-persistence-dc-java * akka-sample-persistence-dc-scala * JDK 17 in CI * add missing resolver * another missing resolver * docs-gen seems to require jdk 11 --- .github/workflows/build-docs-gen.yml | 25 +++++++++++++++++++ .github/workflows/build-test.yml | 14 ++++------- akka-sample-cluster-java/build.sbt | 6 ++--- akka-sample-cluster-java/pom.xml | 7 +++--- akka-sample-cluster-scala/build.sbt | 6 ++--- akka-sample-distributed-data-java/build.sbt | 6 ++--- akka-sample-distributed-data-scala/build.sbt | 6 ++--- .../build.sbt | 8 +++--- akka-sample-fsm-java/pom.xml | 7 +++--- akka-sample-fsm-scala/build.sbt | 6 ++--- akka-sample-kafka-to-sharding-scala/build.sbt | 20 +++++++++------ akka-sample-persistence-java/pom.xml | 7 +++--- akka-sample-persistence-scala/build.sbt | 6 ++--- akka-sample-sharding-java/build.sbt | 6 ++--- .../killrweather-fog/pom.xml | 9 +++---- .../killrweather/pom.xml | 9 +++---- akka-sample-sharding-scala/build.sbt | 10 +++++--- 17 files changed, 91 insertions(+), 67 deletions(-) create mode 100644 .github/workflows/build-docs-gen.yml diff --git a/.github/workflows/build-docs-gen.yml b/.github/workflows/build-docs-gen.yml new file mode 100644 index 00000000..cb28b170 --- /dev/null +++ b/.github/workflows/build-docs-gen.yml @@ -0,0 +1,25 @@ +name: Build and test + +on: + pull_request: + +jobs: + build-test: + name: Build docs-gen + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@v3.1.0 + with: + fetch-depth: 0 + + - name: Set up JDK 11 + uses: coursier/setup-action@v1.3.0 + with: + jvm: temurin:1.11 + + - name: Cache Coursier cache + uses: coursier/cache-action@v6.4.0 + + - name: Test docs gen + run: cd docs-gen && sbt paradox diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e7d39a33..874c6391 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -9,18 +9,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 with: - # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves fetch-depth: 0 - - name: Set up JDK 11 - uses: olafurpg/setup-scala@v10 + - name: Set up JDK 17 + uses: coursier/setup-action@v1.3.0 with: - java-version: adopt@1.11.0 + jvm: temurin:1.17.0 - name: Cache Coursier cache - uses: coursier/cache-action@v6.2 + uses: coursier/cache-action@v6.4.0 - name: Test akka-sample-cluster-java run: cd akka-sample-cluster-java && sbt multi-jvm:test @@ -60,6 +59,3 @@ jobs: - name: Test akka-sample-kafka-to-sharding-scala run: cd akka-sample-kafka-to-sharding-scala && sbt test - - - name: Test docs gen - run: cd docs-gen && sbt paradox diff --git a/akka-sample-cluster-java/build.sbt b/akka-sample-cluster-java/build.sbt index 9588c430..e330ab90 100644 --- a/akka-sample-cluster-java/build.sbt +++ b/akka-sample-cluster-java/build.sbt @@ -1,8 +1,8 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val AkkaVersion = "2.8.5" -val AkkaDiagnosticsVersion = "2.0.1" +val AkkaVersion = "2.9.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" @@ -11,7 +11,7 @@ lazy val `akka-sample-cluster-java` = project .settings(multiJvmSettings: _*) .settings( organization := "com.lightbend.akka.samples", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-parameters", "-Xlint:unchecked", "-Xlint:deprecation"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m", "-Djava.library.path=./target/native"), diff --git a/akka-sample-cluster-java/pom.xml b/akka-sample-cluster-java/pom.xml index 14fc0cc4..685ac0b1 100644 --- a/akka-sample-cluster-java/pom.xml +++ b/akka-sample-cluster-java/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 2.8.5 - 2.0.1 + 2.9.0 + 2.1.0 @@ -64,8 +64,7 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 true -Xlint diff --git a/akka-sample-cluster-scala/build.sbt b/akka-sample-cluster-scala/build.sbt index 99b433c7..8868105f 100644 --- a/akka-sample-cluster-scala/build.sbt +++ b/akka-sample-cluster-scala/build.sbt @@ -1,8 +1,8 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val AkkaVersion = "2.8.5" -val AkkaDiagnosticsVersion = "2.0.1" +val AkkaVersion = "2.9.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" @@ -11,7 +11,7 @@ lazy val `akka-sample-cluster-scala` = project .settings(multiJvmSettings: _*) .settings( organization := "com.lightbend.akka.samples", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m", "-Djava.library.path=./target/native"), diff --git a/akka-sample-distributed-data-java/build.sbt b/akka-sample-distributed-data-java/build.sbt index 26951e11..7159203f 100644 --- a/akka-sample-distributed-data-java/build.sbt +++ b/akka-sample-distributed-data-java/build.sbt @@ -1,8 +1,8 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val AkkaVersion = "2.8.5" -val AkkaDiagnosticsVersion = "2.0.1" +val AkkaVersion = "2.9.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" @@ -12,7 +12,7 @@ val `akka-sample-distributed-data-java` = project .settings( organization := "com.lightbend.akka.samples", version := "1.0", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-parameters", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"), javaOptions in run ++= Seq("-Xms128m", "-Xmx1024m"), diff --git a/akka-sample-distributed-data-scala/build.sbt b/akka-sample-distributed-data-scala/build.sbt index 90e62822..f7324baa 100644 --- a/akka-sample-distributed-data-scala/build.sbt +++ b/akka-sample-distributed-data-scala/build.sbt @@ -1,8 +1,8 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val AkkaVersion = "2.8.5" -val AkkaDiagnosticsVersion = "2.0.1" +val AkkaVersion = "2.9.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" @@ -12,7 +12,7 @@ val `akka-sample-distributed-data-scala` = project .settings( organization := "com.lightbend.akka.samples", version := "1.0", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", scalacOptions in Compile ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), javacOptions in Compile ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), javaOptions in run ++= Seq("-Xms128m", "-Xmx1024m"), diff --git a/akka-sample-distributed-workers-scala/build.sbt b/akka-sample-distributed-workers-scala/build.sbt index 32b412bc..d874ca5f 100644 --- a/akka-sample-distributed-workers-scala/build.sbt +++ b/akka-sample-distributed-workers-scala/build.sbt @@ -2,10 +2,10 @@ name := "akka-distributed-workers" version := "1.0" -scalaVersion := "2.13.10" -val AkkaVersion = "2.8.5" -val CassandraPluginVersion = "1.1.1" -val AkkaDiagnosticsVersion = "2.0.1" +scalaVersion := "2.13.12" +val AkkaVersion = "2.9.0" +val CassandraPluginVersion = "1.2.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" val CommonIoVersion = "2.4" diff --git a/akka-sample-fsm-java/pom.xml b/akka-sample-fsm-java/pom.xml index 42a438b3..7bcd3aa2 100644 --- a/akka-sample-fsm-java/pom.xml +++ b/akka-sample-fsm-java/pom.xml @@ -6,8 +6,8 @@ UTF-8 - 2.8.5 - 2.0.1 + 2.9.0 + 2.1.0 com.lightbend.akka.samples @@ -48,8 +48,7 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 true -Xlint diff --git a/akka-sample-fsm-scala/build.sbt b/akka-sample-fsm-scala/build.sbt index 7c92e90a..83e4c381 100644 --- a/akka-sample-fsm-scala/build.sbt +++ b/akka-sample-fsm-scala/build.sbt @@ -1,11 +1,11 @@ organization := "com.lightbend.akka.samples" name := "akka-sample-fsm-scala" -val AkkaVersion = "2.8.5" +val AkkaVersion = "2.9.0" val LogbackClassicVersion = "1.2.11" -val AkkaDiagnosticsVersion = "2.0.1" +val AkkaDiagnosticsVersion = "2.1.0" -scalaVersion := "2.13.10" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/akka-sample-kafka-to-sharding-scala/build.sbt b/akka-sample-kafka-to-sharding-scala/build.sbt index 9a335578..b8724954 100644 --- a/akka-sample-kafka-to-sharding-scala/build.sbt +++ b/akka-sample-kafka-to-sharding-scala/build.sbt @@ -1,13 +1,13 @@ -val AkkaVersion = "2.8.5" -val AlpakkaKafkaVersion = "4.0.2" -val AkkaManagementVersion = "1.4.0" -val AkkaHttpVersion = "10.5.2" +val AkkaVersion = "2.9.0" +val AlpakkaKafkaVersion = "5.0.0" +val AkkaManagementVersion = "1.5.0" +val AkkaHttpVersion = "10.6.0" val EmbeddedKafkaVersion = "2.4.1.1" val LogbackVersion = "1.2.11" resolvers += "Akka library repository".at("https://repo.akka.io/maven") -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.12" ThisBuild / organization := "com.lightbend.akka.samples" ThisBuild / scalacOptions in Compile ++= Seq( "-deprecation", @@ -30,6 +30,7 @@ lazy val `akka-sample-kafka-to-sharding` = project.in(file(".")).aggregate(produ lazy val kafka = project .in(file("kafka")) .settings( + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), libraryDependencies ++= Seq( "ch.qos.logback" % "logback-classic" % LogbackVersion, "org.slf4j" % "log4j-over-slf4j" % "1.7.26", @@ -40,6 +41,7 @@ lazy val client = project .in(file("client")) .enablePlugins(AkkaGrpcPlugin, JavaAgent) .settings( + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-stream" % AkkaVersion, "com.typesafe.akka" %% "akka-discovery" % AkkaVersion)) @@ -48,7 +50,9 @@ lazy val processor = project .in(file("processor")) .enablePlugins(AkkaGrpcPlugin, JavaAgent) .settings(javaAgents += "org.mortbay.jetty.alpn" % "jetty-alpn-agent" % "2.0.9" % "runtime;test") - .settings(libraryDependencies ++= Seq( + .settings( + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), + libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, "com.typesafe.akka" %% "akka-stream-kafka-cluster-sharding" % AlpakkaKafkaVersion, "com.typesafe.akka" %% "akka-stream" % AkkaVersion, @@ -66,7 +70,9 @@ lazy val processor = project lazy val producer = project .in(file("producer")) .settings(PB.targets in Compile := Seq(scalapb.gen() -> (sourceManaged in Compile).value)) - .settings(libraryDependencies ++= Seq( + .settings( + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), + libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, "com.typesafe.akka" %% "akka-stream" % AkkaVersion, "ch.qos.logback" % "logback-classic" % "1.2.11", diff --git a/akka-sample-persistence-java/pom.xml b/akka-sample-persistence-java/pom.xml index b5ab94e3..0bca9476 100644 --- a/akka-sample-persistence-java/pom.xml +++ b/akka-sample-persistence-java/pom.xml @@ -18,8 +18,8 @@ UTF-8 - 2.8.5 - 2.0.1 + 2.9.0 + 2.1.0 @@ -75,8 +75,7 @@ maven-compiler-plugin 3.6.1 - 1.8 - 1.8 + 17 -Xlint:unchecked -Xlint:deprecation diff --git a/akka-sample-persistence-scala/build.sbt b/akka-sample-persistence-scala/build.sbt index 9f96635e..14a15b6a 100644 --- a/akka-sample-persistence-scala/build.sbt +++ b/akka-sample-persistence-scala/build.sbt @@ -1,9 +1,9 @@ organization := "com.lightbend.akka.samples" name := "akka-sample-persistence-scala" -scalaVersion := "2.13.10" -val AkkaVersion = "2.8.5" -val AkkaDiagnosticsVersion = "2.0.1" +scalaVersion := "2.13.12" +val AkkaVersion = "2.9.0" +val AkkaDiagnosticsVersion = "2.1.0" val LogbackClassicVersion = "1.2.11" val ScalaTestVersion = "3.1.1" diff --git a/akka-sample-sharding-java/build.sbt b/akka-sample-sharding-java/build.sbt index 84b008d3..19fbe73d 100644 --- a/akka-sample-sharding-java/build.sbt +++ b/akka-sample-sharding-java/build.sbt @@ -1,13 +1,13 @@ -val AkkaVersion = "2.8.5" -val AkkaHttpVersion = "10.5.2" +val AkkaVersion = "2.9.0" +val AkkaHttpVersion = "10.6.0" val LogbackVersion = "1.2.11" resolvers += "Akka library repository".at("https://repo.akka.io/maven") lazy val buildSettings = Seq( organization := "com.lightbend.akka.samples", - scalaVersion := "2.13.10" + scalaVersion := "2.13.12" ) lazy val commonJavacOptions = Seq( diff --git a/akka-sample-sharding-java/killrweather-fog/pom.xml b/akka-sample-sharding-java/killrweather-fog/pom.xml index 0e48e31f..787aca45 100644 --- a/akka-sample-sharding-java/killrweather-fog/pom.xml +++ b/akka-sample-sharding-java/killrweather-fog/pom.xml @@ -18,9 +18,9 @@ UTF-8 - 2.8.5 - 10.5.2 - 2.0.1 + 2.9.0 + 10.6.0 + 2.1.0 @@ -77,8 +77,7 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 -Xlint:unchecked -Xlint:deprecation diff --git a/akka-sample-sharding-java/killrweather/pom.xml b/akka-sample-sharding-java/killrweather/pom.xml index 76c04cbe..38f811af 100644 --- a/akka-sample-sharding-java/killrweather/pom.xml +++ b/akka-sample-sharding-java/killrweather/pom.xml @@ -18,9 +18,9 @@ UTF-8 - 2.8.5 - 10.5.2 - 2.0.1 + 2.9.0 + 10.6.0 + 2.1.0 @@ -81,8 +81,7 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 -Xlint:unchecked -Xlint:deprecation diff --git a/akka-sample-sharding-scala/build.sbt b/akka-sample-sharding-scala/build.sbt index 4cd8b579..227aaefd 100644 --- a/akka-sample-sharding-scala/build.sbt +++ b/akka-sample-sharding-scala/build.sbt @@ -1,7 +1,7 @@ -val AkkaVersion = "2.8.5" -val AkkaHttpVersion = "10.5.2" -val AkkaDiagnostics = "2.0.1" +val AkkaVersion = "2.9.0" +val AkkaHttpVersion = "10.6.0" +val AkkaDiagnostics = "2.1.0" val LogbackVersion = "1.2.11" resolvers += "Akka library repository".at("https://repo.akka.io/maven") @@ -22,7 +22,7 @@ lazy val commonJavacOptions = Seq( lazy val commonSettings = Seq( organization := "com.lightbend.akka.samples", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", Compile / scalacOptions ++= commonScalacOptions, Compile / javacOptions ++= commonJavacOptions, run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m"), @@ -37,6 +37,7 @@ lazy val killrweather = project .settings(commonSettings) .settings( mainClass in (Compile, run) := Some("sample.killrweather.KillrWeather"), + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-cluster-sharding-typed" % AkkaVersion, "com.typesafe.akka" %% "akka-serialization-jackson" % AkkaVersion, @@ -52,6 +53,7 @@ lazy val `killrweather-fog` = project .settings(commonSettings) .settings( mainClass in (Compile, run) := Some("sample.killrweather.fog.Fog"), + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, "com.typesafe.akka" %% "akka-stream-typed" % AkkaVersion,