docs: Fix broken samples #32667 (#32668)

* docs: Fix incorrect sharding sample dependencies #32667

* some fixes to the kafka sample as well

* Some more dependency bumps

Author: johanandren

samples/akka-sample-cluster-scala/build.sbt

@@ -3,7 +3,7 @@ import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
 val AkkaVersion = "2.10.2"
 val AkkaDiagnosticsVersion = "2.1.1"
-val LogbackClassicVersion = "1.2.11" 
+val LogbackClassicVersion = "1.5.16"
 val ScalaTestVersion = "3.2.17"
 
 lazy val `akka-sample-cluster-scala` = project

samples/akka-sample-distributed-data-scala/build.sbt

@@ -2,7 +2,7 @@ import com.typesafe.sbt.MultiJvmPlugin.multiJvmSettings
 
 val AkkaVersion = "2.10.2"
 val AkkaDiagnosticsVersion = "2.1.1"
-val LogbackClassicVersion = "1.2.11"
+val LogbackClassicVersion = "1.5.16"
 val ScalaTestVersion = "3.2.17"
 
 val `akka-sample-distributed-data-scala` = project

samples/akka-sample-fsm-scala/build.sbt

@@ -2,7 +2,7 @@ organization := "com.lightbend.akka.samples"
 name := "akka-sample-fsm-scala"
 
 val AkkaVersion = "2.10.2"
-val LogbackClassicVersion = "1.2.11"
+val LogbackClassicVersion = "1.5.1"
 val AkkaDiagnosticsVersion = "2.1.0"
 
 scalaVersion := "2.13.12"

samples/akka-sample-kafka-to-sharding-scala/build.sbt

@@ -1,28 +1,29 @@
 val AkkaVersion = "2.10.2"
-val AlpakkaKafkaVersion = "6.0.0"
-val AkkaManagementVersion = "1.5.2"
-val AkkaHttpVersion = "10.6.3"
+val AlpakkaKafkaVersion = "7.0.1"
+val AkkaManagementVersion = "1.6.0"
+val AkkaHttpVersion = "10.7.0"
 val EmbeddedKafkaVersion = "3.7.0"
-val LogbackVersion = "1.2.11"
+val LogbackVersion = "1.5.16"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 ThisBuild / scalaVersion := "2.13.15"
 ThisBuild / organization := "com.lightbend.akka.samples"
-ThisBuild / scalacOptions in Compile ++= Seq(
+ThisBuild / Compile / scalacOptions ++= Seq(
   "-deprecation",
   "-feature",
   "-unchecked",
   "-Xlog-reflective-calls",
   "-Xlint")
-ThisBuild / javacOptions in Compile ++= Seq("-Xlint:unchecked", "-Xlint:deprecation")
-ThisBuild / testOptions in Test += Tests.Argument("-oDF")
+ThisBuild / Test / javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation")
+ThisBuild / Test / testOptions += Tests.Argument("-oDF")
 ThisBuild / licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
 ThisBuild / resolvers ++= Seq(
   "Akka Snapshots".at("https://repo.akka.io/snapshots"),
   Resolver.bintrayRepo("akka", "snapshots"))
 
-run / fork := true
+ThisBuild / run / fork := true
+ThisBuild / run / connectInput := true
 
 lazy val `akka-sample-kafka-to-sharding` = project.in(file(".")).aggregate(producer, processor, client)
 
@@ -32,7 +33,7 @@ lazy val kafka = project
     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",
+        "org.slf4j" % "log4j-over-slf4j" % "2.0.16",
         "io.github.embeddedkafka" %% "embedded-kafka" % EmbeddedKafkaVersion),
     cancelable := false)
 
@@ -43,7 +44,9 @@ lazy val client = project
     resolvers += "Akka library repository".at("https://repo.akka.io/maven"),
     libraryDependencies ++= Seq(
         "com.typesafe.akka" %% "akka-stream" % AkkaVersion,
-        "com.typesafe.akka" %% "akka-discovery" % AkkaVersion))
+        "com.typesafe.akka" %% "akka-pki" % AkkaVersion,
+        "com.typesafe.akka" %% "akka-discovery" % AkkaVersion,
+        "ch.qos.logback" % "logback-classic" % LogbackVersion))
 
 lazy val processor = project
   .in(file("processor"))
@@ -67,11 +70,11 @@ lazy val processor = project
 
 lazy val producer = project
   .in(file("producer"))
-  .settings(PB.targets in Compile := Seq(scalapb.gen() -> (sourceManaged in Compile).value))
+  .settings(Compile / PB.targets := Seq(scalapb.gen() -> (Compile / sourceManaged).value))
   .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",
+        "ch.qos.logback" % "logback-classic" % LogbackVersion,
         "org.scalatest" %% "scalatest" % "3.2.18" % Test))

samples/akka-sample-kafka-to-sharding-scala/client/src/main/resources/application.conf

@@ -22,7 +22,7 @@ object ClientApp extends App {
   while (userId != ":q") {
     println("Enter user id or :q to quit")
     userId = StdIn.readLine()
-    if (userId != ":q") {
+    if (userId != ":q" && userId != null) {
       val runningTotal = Await.result(client.userStats(UserStatsRequest(userId)), Duration.Inf)
       println(
         s"User ${userId} has made ${runningTotal.totalPurchases} purchases for a total of ${runningTotal.amountSpent}p")

samples/akka-sample-kafka-to-sharding-scala/client/src/main/scala/client/ClientApp.scala

@@ -97,7 +97,7 @@ object Main {
             Behaviors.stopped
         }
         .receiveSignal {
-          case (ctx, Terminated(`processor`)) =>
+          case (_, Terminated(`processor`)) =>
             ctx.log.warn("Kafka event processor stopped. Shutting down")
             binding.map(_.unbind())(ctx.executionContext)
             Behaviors.stopped

samples/akka-sample-kafka-to-sharding-scala/processor/src/main/scala/sample/sharding/kafka/Main.scala

@@ -1,3 +1,3 @@
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.3")

samples/akka-sample-kafka-to-sharding-scala/project/plugins.sbt

@@ -1,6 +1,6 @@
 
 val AkkaVersion = "2.10.2"
-val AkkaHttpVersion = "10.6.0"
+val AkkaHttpVersion = "10.7.0"
 val LogbackVersion = "1.2.11"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")

samples/akka-sample-sharding-java/build.sbt

@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.10.2</akka.version>
-        <akka-http.version>10.6.0</akka-http.version>
+        <akka-http.version>10.7.0</akka-http.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
     </properties>
 
@@ -42,6 +42,11 @@
             <artifactId>akka-stream-typed_2.13</artifactId>
             <version>${akka.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-pki_2.13</artifactId>
+            <version>${akka.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-serialization-jackson_2.13</artifactId>