From edc629c058f2cff1fbb5005a0ef9236b6da8333c Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 24 Oct 2023 13:33:09 +0200
Subject: [PATCH] bump: Scala 2.13.12 (#1687)

* bump: Scala 2.13.12

* ambiguous log in test
---
 build.sbt                                            |  2 +-
 scripts/link-validator.conf                          |  2 +-
 .../scala/akka/kafka/internal/ConsumerDummy.scala    |  2 +-
 .../akka/kafka/internal/PartitionedSourceSpec.scala  | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index 123cad6b1..19a877bee 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,7 +10,7 @@ val Nightly = sys.env.get("EVENT_NAME").contains("schedule")
 
 // align ignore-prefixes in scripts/link-validator.conf
 // align in release.yml
-val Scala213 = "2.13.11"
+val Scala213 = "2.13.12"
 val Scala3 = "3.3.1"
 val Scala2Versions = Seq(Scala213)
 val ScalaVersions = Scala2Versions :+ Scala3
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index ffb4e3f08..5cadbf8f3 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -20,7 +20,7 @@ site-link-validator {
 
   ignore-prefixes = [
     # runtime is NOT part of the published Scaladoc
-    "https://www.scala-lang.org/api/2.13.11/scala/runtime/AbstractFunction2.html"
+    "https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction2.html"
     # GitHub will block with "429 Too Many Requests"
     "https://github.com/"
     # MVN repository forbids access after a few requests
diff --git a/tests/src/test/scala/akka/kafka/internal/ConsumerDummy.scala b/tests/src/test/scala/akka/kafka/internal/ConsumerDummy.scala
index 506c53a2a..4f978463d 100644
--- a/tests/src/test/scala/akka/kafka/internal/ConsumerDummy.scala
+++ b/tests/src/test/scala/akka/kafka/internal/ConsumerDummy.scala
@@ -28,7 +28,7 @@ object ConsumerDummy {
 
 abstract class ConsumerDummy[K, V] extends Consumer[K, V] {
   def name: String
-  lazy val log: Logger = LoggerFactory.getLogger(name)
+  lazy val logger: Logger = LoggerFactory.getLogger(name)
 
   private val firstPausingPromise = Promise[Done]()
   def started = firstPausingPromise.future
diff --git a/tests/src/test/scala/akka/kafka/internal/PartitionedSourceSpec.scala b/tests/src/test/scala/akka/kafka/internal/PartitionedSourceSpec.scala
index d3c300917..97a86d801 100644
--- a/tests/src/test/scala/akka/kafka/internal/PartitionedSourceSpec.scala
+++ b/tests/src/test/scala/akka/kafka/internal/PartitionedSourceSpec.scala
@@ -780,7 +780,7 @@ object PartitionedSourceSpec {
     }
 
     def setNextPollData(tpRecord: (TopicPartition, java.util.List[ConsumerRecord[K, V]])*): Unit = {
-      log.debug(s"data available for ${tpRecord.toMap.keys.mkString(", ")}")
+      logger.debug(s"data available for ${tpRecord.toMap.keys.mkString(", ")}")
       nextPollData.set(tpRecord.toMap)
     }
 
@@ -802,17 +802,17 @@ object PartitionedSourceSpec {
       }
       nextPollData.set(dataPaused)
       if (dataPaused.nonEmpty) {
-        log.debug(s"data for paused partitions $dataPaused")
+        logger.debug(s"data for paused partitions $dataPaused")
       }
       if (data2.nonEmpty) {
-        log.debug(s"poll result $data2")
+        logger.debug(s"poll result $data2")
       }
       new ConsumerRecords[K, V](data2.asJava)
     }
     override def position(partition: TopicPartition): Long = 0
     override def position(partition: TopicPartition, timeout: java.time.Duration): Long = 0
     override def seek(partition: TopicPartition, offset: Long): Unit = {
-      log.debug(s"seek($partition, $offset)")
+      logger.debug(s"seek($partition, $offset)")
       if (!assignment().contains(partition)) {
         throw new IllegalStateException(s"Seeking on partition $partition which is not currently assigned")
       }
@@ -824,12 +824,12 @@ object PartitionedSourceSpec {
     override def pause(partitions: java.util.Collection[TopicPartition]): Unit = {
       super.pause(partitions)
       val ps = partitions.asScala
-      log.debug(s"pausing ${ps.mkString("(", ", ", ")")}")
+      logger.debug(s"pausing ${ps.mkString("(", ", ", ")")}")
       tps.updateAndGet(unary(t => t ++ ps.filter(tp => t.contains(tp)).map(_ -> Paused)))
     }
     override def resume(partitions: java.util.Collection[TopicPartition]): Unit = {
       val ps = partitions.asScala
-      log.debug(s"resuming ${ps.mkString("(", ", ", ")")}")
+      logger.debug(s"resuming ${ps.mkString("(", ", ", ")")}")
       tps.updateAndGet(unary(t => t ++ ps.filter(tp => t.contains(tp)).map(_ -> Resumed)))
     }
   }