This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-pekko-connectors-kafka.git
The following commit(s) were added to refs/heads/main by this push:
new 49c087eb Update Scala versions and add Scala 2.12
49c087eb is described below
commit 49c087ebd907f3a5f105d17e4021adcf35f1c38b
Author: Matthew de Detrich <[email protected]>
AuthorDate: Mon Mar 20 08:22:23 2023 +0100
Update Scala versions and add Scala 2.12
---
.github/workflows/check-build-test.yml | 4 ++--
.../scala/org/apache/pekko/kafka/benchmarks/InflightMetrics.scala | 2 +-
.../apache/pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala | 2 +-
.../apache/pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala | 6 +++---
.../apache/pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala | 5 +++--
.../apache/pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala | 6 +++---
core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala | 2 +-
core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala | 2 +-
core/src/main/scala/org/apache/pekko/kafka/Metadata.scala | 6 ++++--
core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala | 5 +++--
core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala | 2 +-
core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala | 2 +-
.../scala/org/apache/pekko/kafka/internal/ConfigSettings.scala | 2 +-
.../org/apache/pekko/kafka/internal/ConsumerProgressTracking.scala | 7 ++++---
.../org/apache/pekko/kafka/internal/ConsumerResetProtection.scala | 3 +--
.../org/apache/pekko/kafka/internal/ControlImplementations.scala | 2 +-
.../scala/org/apache/pekko/kafka/internal/KafkaConsumerActor.scala | 3 ++-
.../scala/org/apache/pekko/kafka/internal/MessageBuilder.scala | 4 +++-
.../apache/pekko/kafka/internal/PartitionAssignmentHelpers.scala | 3 +--
.../scala/org/apache/pekko/kafka/internal/SubSourceLogic.scala | 1 +
.../apache/pekko/kafka/internal/TransactionalProducerStage.scala | 2 +-
.../org/apache/pekko/kafka/internal/TransactionalSources.scala | 1 +
core/src/main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala | 2 +-
.../main/scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala | 3 ++-
project/ProjectSettings.scala | 2 +-
project/Versions.scala | 6 +++---
scripts/link-validator.conf | 2 +-
.../org/apache/pekko/kafka/testkit/ProducerResultFactory.scala | 2 +-
.../org/apache/pekko/kafka/testkit/internal/KafkaTestKit.scala | 3 +--
.../apache/pekko/kafka/testkit/internal/TestcontainersKafka.scala | 2 +-
.../scala/org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala | 2 +-
tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala | 3 +--
.../test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala | 2 +-
.../apache/pekko/kafka/internal/CommittingProducerSinkSpec.scala | 2 +-
.../test/scala/org/apache/pekko/kafka/internal/ConsumerMock.scala | 2 +-
.../apache/pekko/kafka/internal/ConsumerProgressTrackingSpec.scala | 5 +++--
.../apache/pekko/kafka/internal/ConsumerResetProtectionSpec.scala | 2 +-
.../test/scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala | 2 +-
.../org/apache/pekko/kafka/internal/PartitionedSourceSpec.scala | 2 +-
.../test/scala/org/apache/pekko/kafka/internal/ProducerSpec.scala | 2 +-
.../test/scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala | 2 +-
.../org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala | 2 +-
.../test/scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala | 2 +-
.../scala/org/apache/pekko/kafka/tests/CapturingAppender.scala | 2 +-
44 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/.github/workflows/check-build-test.yml
b/.github/workflows/check-build-test.yml
index d0d13cbe..afc30fb5 100644
--- a/.github/workflows/check-build-test.yml
+++ b/.github/workflows/check-build-test.yml
@@ -112,8 +112,8 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: 8, scala-version: 2.13.8, sbt-opts: '' }
- - { java-version: 11, scala-version: 2.13.8, sbt-opts:
'-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts:
'-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/InflightMetrics.scala
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/InflightMetrics.scala
index e0aa9da9..588007e5 100644
---
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/InflightMetrics.scala
+++
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/InflightMetrics.scala
@@ -22,13 +22,13 @@ import pekko.actor.Cancellable
import pekko.kafka.scaladsl.Consumer.Control
import pekko.stream.Materializer
import pekko.stream.scaladsl.{ Keep, Sink, Source }
+import pekko.util.ccompat.JavaConverters._
import com.codahale.metrics.{ Histogram, MetricRegistry }
import javax.management.remote.{ JMXConnectorFactory, JMXServiceURL }
import javax.management.{ Attribute, MBeanServerConnection, ObjectName }
import scala.concurrent.duration.{ FiniteDuration, _ }
import scala.concurrent.{ ExecutionContext, Future }
-import scala.jdk.CollectionConverters._
private[benchmarks] trait InflightMetrics {
import InflightMetrics._
diff --git
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala
index ca14b594..116a5d0b 100644
---
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala
+++
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala
@@ -21,9 +21,9 @@ import com.codahale.metrics.Meter
import com.typesafe.scalalogging.LazyLogging
import org.apache.kafka.clients.consumer.{ OffsetAndMetadata,
OffsetCommitCallback }
import org.apache.kafka.common.TopicPartition
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.annotation.tailrec
-import scala.jdk.CollectionConverters._
object KafkaConsumerBenchmarks extends LazyLogging {
val pollTimeoutMs: Duration = Duration.ofMillis(50L)
diff --git
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala
index 5a06e694..c0829140 100644
---
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala
+++
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala
@@ -14,12 +14,12 @@
package org.apache.pekko.kafka.benchmarks
-import org.apache.pekko.kafka.benchmarks.app.RunTestCommand
+import org.apache.pekko
+import pekko.kafka.benchmarks.app.RunTestCommand
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerConfig, KafkaConsumer }
import org.apache.kafka.common.serialization.{ ByteArrayDeserializer,
StringDeserializer }
-import scala.jdk.CollectionConverters._
-
case class KafkaConsumerTestFixture(topic: String, msgCount: Int, consumer:
KafkaConsumer[Array[Byte], String]) {
def close(): Unit = consumer.close()
}
diff --git
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala
index 70f0705f..fd7f18fa 100644
---
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala
+++
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala
@@ -14,7 +14,9 @@
package org.apache.pekko.kafka.benchmarks
-import org.apache.pekko.kafka.benchmarks.KafkaConsumerBenchmarks.pollTimeoutMs
+import org.apache.pekko
+import pekko.kafka.benchmarks.KafkaConsumerBenchmarks.pollTimeoutMs
+import pekko.util.ccompat.JavaConverters._
import com.codahale.metrics.Meter
import com.typesafe.scalalogging.LazyLogging
import org.apache.kafka.clients.consumer._
@@ -22,7 +24,6 @@ import org.apache.kafka.clients.producer.{ Callback,
ProducerRecord, RecordMetad
import org.apache.kafka.common.TopicPartition
import scala.annotation.tailrec
-import scala.jdk.CollectionConverters._
import scala.concurrent.duration.FiniteDuration
object KafkaTransactionBenchmarks extends LazyLogging {
diff --git
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala
index b38006d2..3ec351a0 100644
---
a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala
+++
b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala
@@ -16,7 +16,9 @@ package org.apache.pekko.kafka.benchmarks
import java.util.Locale
-import org.apache.pekko.kafka.benchmarks.app.RunTestCommand
+import org.apache.pekko
+import pekko.kafka.benchmarks.app.RunTestCommand
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerConfig, KafkaConsumer }
import org.apache.kafka.clients.producer.{ KafkaProducer, ProducerConfig }
import org.apache.kafka.common.IsolationLevel
@@ -27,8 +29,6 @@ import org.apache.kafka.common.serialization.{
StringSerializer
}
-import scala.jdk.CollectionConverters._
-
case class KafkaTransactionTestFixture(sourceTopic: String,
sinkTopic: String,
msgCount: Int,
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
b/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
index 1be1bc28..656c1714 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
@@ -188,7 +188,7 @@ object ConsumerMessage {
* Create an offset batch out of a list of offsets.
*/
def createCommittableOffsetBatch[T <: Committable](offsets:
java.util.List[T]): CommittableOffsetBatch = {
- import scala.jdk.CollectionConverters._
+ import pekko.util.ccompat.JavaConverters._
CommittableOffsetBatch(offsets.asScala.toList)
}
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
b/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
index bf1131ad..26729e9f 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
@@ -21,11 +21,11 @@ import org.apache.pekko
import pekko.annotation.InternalApi
import pekko.kafka.internal._
import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.Config
import org.apache.kafka.clients.consumer.{ Consumer, ConsumerConfig,
KafkaConsumer }
import org.apache.kafka.common.serialization.Deserializer
-import scala.jdk.CollectionConverters._
import scala.compat.java8.OptionConverters._
import scala.compat.java8.FutureConverters._
import scala.concurrent.{ ExecutionContext, Future }
diff --git a/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
b/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
index 52aed080..c3c1b196 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
@@ -16,11 +16,13 @@ package org.apache.pekko.kafka
import java.util.Optional
-import org.apache.pekko.actor.NoSerializationVerificationNeeded
+import org.apache.pekko
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ OffsetAndMetadata,
OffsetAndTimestamp }
import org.apache.kafka.common.{ PartitionInfo, TopicPartition }
-import scala.jdk.CollectionConverters._
import scala.util.Try
/**
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
b/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
index 24d8b95d..37785610 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.kafka
-import org.apache.pekko.NotUsed
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.producer.{ ProducerRecord, RecordMetadata }
import scala.collection.immutable
-import scala.jdk.CollectionConverters._
/**
* Classes that are used in both [[javadsl.Producer]] and
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
b/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
index 3b1cc151..816768d7 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
@@ -24,9 +24,9 @@ import com.typesafe.config.Config
import org.apache.kafka.clients.producer.{ KafkaProducer, Producer,
ProducerConfig }
import org.apache.kafka.common.serialization.Serializer
-import scala.jdk.CollectionConverters._
import scala.compat.java8.OptionConverters._
import scala.concurrent.duration._
+import pekko.util.ccompat.JavaConverters._
import pekko.util.JavaDurationConverters._
import scala.concurrent.{ ExecutionContext, Future }
diff --git a/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
b/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
index b166c406..e7448acb 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
@@ -19,10 +19,10 @@ import pekko.actor.ActorRef
import pekko.annotation.{ ApiMayChange, InternalApi }
import pekko.kafka.internal.PartitionAssignmentHelpers
import
pekko.kafka.internal.PartitionAssignmentHelpers.EmptyPartitionAssignmentHandler
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.common.TopicPartition
import scala.annotation.varargs
-import scala.jdk.CollectionConverters._
sealed trait Subscription {
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/ConfigSettings.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/ConfigSettings.scala
index 3635ff30..76695005 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/ConfigSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/ConfigSettings.scala
@@ -21,8 +21,8 @@ import pekko.annotation.InternalApi
import com.typesafe.config.{ Config, ConfigObject }
import scala.annotation.tailrec
-import scala.jdk.CollectionConverters._
import scala.concurrent.duration.Duration
+import pekko.util.ccompat.JavaConverters._
import pekko.util.JavaDurationConverters._
/**
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerProgressTracking.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerProgressTracking.scala
index 56621cbf..fe0ecc97 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerProgressTracking.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerProgressTracking.scala
@@ -13,12 +13,13 @@
*/
package org.apache.pekko.kafka.internal
-import org.apache.pekko.annotation.InternalApi
+
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ Consumer, ConsumerRecords,
OffsetAndMetadata }
import org.apache.kafka.common.TopicPartition
-import scala.jdk.CollectionConverters._
-
/**
* Maintain our own OffsetAndTimestamp which can tolerate negative timestamps,
which happen for old clients that
* don't set timestamp explicitly.
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerResetProtection.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerResetProtection.scala
index e955f400..b64b6e41 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerResetProtection.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/ConsumerResetProtection.scala
@@ -22,11 +22,10 @@ import pekko.annotation.InternalApi
import pekko.event.LoggingAdapter
import pekko.kafka.OffsetResetProtectionSettings
import pekko.kafka.internal.KafkaConsumerActor.Internal.Seek
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerRecord, ConsumerRecords,
OffsetAndMetadata }
import org.apache.kafka.common.TopicPartition
-import scala.jdk.CollectionConverters._
-
/**
* Added as part of https://github.com/akka/alpakka-kafka/issues/1286 to avoid
reprocessing data in case of Kafka
* temporarily "losing" an offset.
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/ControlImplementations.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/ControlImplementations.scala
index 69f73773..57b2c5b0 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/ControlImplementations.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/ControlImplementations.scala
@@ -24,10 +24,10 @@ import pekko.kafka.internal.KafkaConsumerActor.Internal.{
ConsumerMetrics, Reque
import pekko.kafka.{ javadsl, scaladsl }
import pekko.stream.SourceShape
import pekko.stream.stage.GraphStageLogic
+import pekko.util.ccompat.JavaConverters._
import pekko.util.Timeout
import org.apache.kafka.common.{ Metric, MetricName }
-import scala.jdk.CollectionConverters._
import scala.compat.java8.FutureConverters.{ CompletionStageOps, FutureOps }
import scala.concurrent.{ ExecutionContext, Future, Promise }
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaConsumerActor.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaConsumerActor.scala
index cad055a3..d2d32fb1 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaConsumerActor.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaConsumerActor.scala
@@ -36,12 +36,13 @@ import pekko.event.LoggingReceive
import pekko.kafka.KafkaConsumerActor.{ StopLike, StoppingException }
import pekko.kafka._
import pekko.kafka.scaladsl.PartitionAssignmentHandler
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer._
import org.apache.kafka.common.errors.RebalanceInProgressException
import org.apache.kafka.common.{ Metric, MetricName, TopicPartition }
import scala.annotation.nowarn
-import scala.jdk.CollectionConverters._
import scala.concurrent.{ ExecutionContext, Future }
import scala.concurrent.duration._
import scala.util.{ Success, Try }
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/MessageBuilder.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/MessageBuilder.scala
index 3a39f184..47b1921e 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/MessageBuilder.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/MessageBuilder.scala
@@ -13,6 +13,7 @@
*/
package org.apache.pekko.kafka.internal
+
import java.util.concurrent.CompletionStage
import org.apache.pekko
@@ -26,13 +27,14 @@ import pekko.kafka.ConsumerMessage.{
TransactionalMessage,
_
}
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerRecord, OffsetAndMetadata }
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.requests.OffsetFetchResponse
import scala.compat.java8.FutureConverters.FutureOps
import scala.concurrent.Future
-import scala.jdk.CollectionConverters._
/** Internal API */
@InternalApi
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/PartitionAssignmentHelpers.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/PartitionAssignmentHelpers.scala
index 04f3acc9..afbcce6f 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/PartitionAssignmentHelpers.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/PartitionAssignmentHelpers.scala
@@ -21,10 +21,9 @@ import pekko.kafka.scaladsl.PartitionAssignmentHandler
import pekko.kafka.javadsl
import pekko.kafka.{ AutoSubscription, RestrictedConsumer,
TopicPartitionsAssigned, TopicPartitionsRevoked }
import pekko.stream.stage.AsyncCallback
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.common.TopicPartition
-import scala.jdk.CollectionConverters._
-
/**
* Internal API.
*
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/SubSourceLogic.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/SubSourceLogic.scala
index fd9fe846..9cdd6548 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/SubSourceLogic.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/SubSourceLogic.scala
@@ -29,6 +29,7 @@ import pekko.stream.scaladsl.Source
import pekko.stream.stage.GraphStageLogic.StageActor
import pekko.stream.stage._
import pekko.stream.{ Attributes, Outlet, SourceShape }
+import pekko.util.ccompat._
import pekko.util.Timeout
import org.apache.kafka.common.TopicPartition
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalProducerStage.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalProducerStage.scala
index cf26a6a1..ff9a4754 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalProducerStage.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalProducerStage.scala
@@ -24,13 +24,13 @@ import
pekko.kafka.internal.ProducerStage.ProducerCompletionState
import pekko.kafka.{ ConsumerMessage, ProducerSettings }
import pekko.stream.stage._
import pekko.stream.{ Attributes, FlowShape }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerGroupMetadata,
OffsetAndMetadata }
import org.apache.kafka.clients.producer.ProducerConfig
import org.apache.kafka.common.TopicPartition
import scala.concurrent.Future
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
/**
* INTERNAL API
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalSources.scala
b/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalSources.scala
index ec6c029f..6f50d5c2 100644
---
a/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalSources.scala
+++
b/core/src/main/scala/org/apache/pekko/kafka/internal/TransactionalSources.scala
@@ -31,6 +31,7 @@ import pekko.kafka.{ AutoSubscription, ConsumerFailed,
ConsumerSettings, Restric
import pekko.stream.SourceShape
import pekko.stream.scaladsl.Source
import pekko.stream.stage.{ AsyncCallback, GraphStageLogic }
+import pekko.util.ccompat._
import pekko.util.Timeout
import org.apache.kafka.clients.consumer.{ ConsumerConfig, ConsumerRecord,
OffsetAndMetadata }
import org.apache.kafka.common.{ IsolationLevel, TopicPartition }
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala
b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala
index 3e4323cc..0043ff8c 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala
@@ -26,10 +26,10 @@ import pekko.kafka._
import pekko.kafka.internal.{ ConsumerControlAsJava, SourceWithOffsetContext }
import pekko.stream.javadsl.{ Source, SourceWithContext }
import pekko.{ Done, NotUsed }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.common.{ Metric, MetricName, TopicPartition }
-import scala.jdk.CollectionConverters._
import scala.compat.java8.FutureConverters._
import scala.concurrent.duration.FiniteDuration
diff --git
a/core/src/main/scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala
b/core/src/main/scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala
index 2bcb2e12..03963843 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala
@@ -20,13 +20,14 @@ import org.apache.pekko
import pekko.actor.{ ActorRef, ActorSystem }
import pekko.dispatch.ExecutionContexts
import pekko.kafka.ConsumerSettings
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
import pekko.util.Timeout
import org.apache.kafka.clients.consumer.OffsetAndMetadata
import org.apache.kafka.common.{ PartitionInfo, TopicPartition }
import scala.compat.java8.FutureConverters._
import scala.concurrent.ExecutionContextExecutor
-import scala.jdk.CollectionConverters._
class MetadataClient private (metadataClient:
pekko.kafka.scaladsl.MetadataClient) {
diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala
index 2acdf4c7..4afa34b4 100644
--- a/project/ProjectSettings.scala
+++ b/project/ProjectSettings.scala
@@ -77,7 +77,7 @@ object ProjectSettings extends AutoPlugin {
url("https://github.com/apache/incubator-pekko-connectors-kafka/graphs/contributors";)),
startYear := Some(2022),
description := "Apache Pekko Kafka Connector is a Reactive Enterprise
Integration library for Java and Scala, based on Reactive Streams and Apache
Pekko.",
- crossScalaVersions := Seq(Scala213),
+ crossScalaVersions := Seq(Scala212, Scala213),
scalaVersion := Scala213,
crossVersion := CrossVersion.binary,
javacOptions ++= Seq(
diff --git a/project/Versions.scala b/project/Versions.scala
index aad82500..74e7d092 100644
--- a/project/Versions.scala
+++ b/project/Versions.scala
@@ -16,11 +16,11 @@ object Versions {
val Nightly: Boolean = sys.env.get("EVENT_NAME").contains("schedule")
// align ignore-prefixes in scripts/link-validator.conf
- // align in release.yml
- val Scala213 = "2.13.8"
+ val Scala213 = "2.13.10" // update even in link-validator.conf
+ val Scala212 = "2.12.17"
val pekkoVersionForDocs = "current"
- val pekkoVersion = "0.0.0+26546-767209a8-SNAPSHOT"
+ val pekkoVersion = "0.0.0+26621-44d03df6-SNAPSHOT"
// Keep .scala-steward.conf pin in sync
val kafkaVersion = "3.0.1"
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index 1ead0577..ebbc1ac1 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -20,7 +20,7 @@ site-link-validator {
ignore-prefixes = [
# runtime is part of the published Scaladoc
-
"https://www.scala-lang.org/api/2.13.8/scala/runtime/AbstractFunction2.html";
+
"https://www.scala-lang.org/api/2.13.10/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/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ProducerResultFactory.scala
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ProducerResultFactory.scala
index 77e8103b..16624255 100644
---
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ProducerResultFactory.scala
+++
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ProducerResultFactory.scala
@@ -17,10 +17,10 @@ package org.apache.pekko.kafka.testkit
import org.apache.pekko
import pekko.annotation.ApiMayChange
import pekko.kafka.ProducerMessage
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.producer.{ ProducerRecord, RecordMetadata }
import org.apache.kafka.common.TopicPartition
-import scala.jdk.CollectionConverters._
import scala.collection.immutable
/**
diff --git
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKit.scala
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKit.scala
index fbe74858..37bffbc2 100644
---
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKit.scala
+++
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKit.scala
@@ -23,13 +23,12 @@ import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.kafka.testkit.KafkaTestkitSettings
import pekko.kafka.{ CommitterSettings, ConsumerSettings, ProducerSettings }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.admin.{ Admin, AdminClientConfig, NewTopic }
import org.apache.kafka.clients.consumer.ConsumerConfig
import org.apache.kafka.common.serialization.{ Deserializer, Serializer,
StringDeserializer, StringSerializer }
import org.slf4j.Logger
-import scala.jdk.CollectionConverters._
-
/**
* Common functions for scaladsl and javadsl Testkit.
*
diff --git
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestcontainersKafka.scala
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestcontainersKafka.scala
index ac4f1208..339555ec 100644
---
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestcontainersKafka.scala
+++
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestcontainersKafka.scala
@@ -18,11 +18,11 @@ import org.apache.pekko
import pekko.kafka.testkit.KafkaTestkitTestcontainersSettings
import pekko.kafka.testkit.scaladsl.KafkaSpec
import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat.JavaConverters._
import org.testcontainers.containers.GenericContainer
import org.testcontainers.utility.DockerImageName
import scala.compat.java8.OptionConverters._
-import scala.jdk.CollectionConverters._
object TestcontainersKafka {
trait Spec extends KafkaSpec {
diff --git
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala
index 638a9966..255a218c 100644
---
a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala
+++
b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala
@@ -31,6 +31,7 @@ import pekko.stream.scaladsl.{ Keep, Source }
import pekko.stream.testkit.TestSubscriber
import pekko.stream.testkit.scaladsl.TestSink
import pekko.testkit.TestKit
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.admin._
import org.apache.kafka.clients.producer.{ Producer => KProducer,
ProducerRecord }
import org.apache.kafka.common.ConsumerGroupState
@@ -39,7 +40,6 @@ import org.slf4j.{ Logger, LoggerFactory }
import scala.collection.immutable
import scala.concurrent.duration._
import scala.concurrent.{ Await, ExecutionContext, Future }
-import scala.jdk.CollectionConverters._
import scala.util.Try
abstract class KafkaSpec(_kafkaPort: Int, val zooKeeperPort: Int, actorSystem:
ActorSystem)
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
b/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
index bd64c148..a5dfa70f 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
@@ -17,12 +17,11 @@ package org.apache.pekko.kafka
import org.apache.pekko
import pekko.NotUsed
import pekko.stream.scaladsl.Flow
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.common.TopicPartition
import org.slf4j.Logger
import org.testcontainers.containers.GenericContainer
-import scala.jdk.CollectionConverters._
-
object IntegrationTests {
val MessageLogInterval = 500L
diff --git
a/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
b/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
index cd1612fa..32f9031e 100644
--- a/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
@@ -25,6 +25,7 @@ import
pekko.kafka.testkit.scaladsl.TestcontainersKafkaPerClassLike
import pekko.stream.scaladsl.{ Keep, Sink, Source }
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
+import pekko.util.ccompat.JavaConverters._
import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig
import org.apache.avro.specific.SpecificRecordBase
import org.apache.avro.util.Utf8
@@ -42,7 +43,6 @@ import org.apache.kafka.clients.producer.ProducerRecord
// #imports
import org.apache.kafka.common.serialization._
// #imports
-import scala.jdk.CollectionConverters._
// #schema-registry-settings
class SchemaRegistrySerializationSpec extends DocsSpecBase with
TestcontainersKafkaPerClassLike {
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkSpec.scala
index 367d1a8f..a536da34 100644
---
a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkSpec.scala
+++
b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkSpec.scala
@@ -31,6 +31,7 @@ import pekko.stream.scaladsl.{ Keep, Source }
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.{ ActorAttributes, Supervision }
import pekko.testkit.{ TestKit, TestProbe }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.clients.producer._
import org.apache.kafka.common.TopicPartition
@@ -43,7 +44,6 @@ import org.slf4j.{ Logger, LoggerFactory }
import scala.collection.immutable
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
class CommittingProducerSinkSpec(_system: ActorSystem)
extends TestKit(_system)
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerMock.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerMock.scala
index ae0d07f0..98b99edb 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerMock.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerMock.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.atomic.AtomicBoolean
import org.apache.pekko
import pekko.testkit.TestKit
+import pekko.util.ccompat.JavaConverters._
import pekko.util.JavaDurationConverters._
import org.apache.kafka.clients.consumer._
import org.apache.kafka.common.TopicPartition
@@ -27,7 +28,6 @@ import org.mockito.stubbing.Answer
import org.mockito.verification.VerificationMode
import org.mockito.{ ArgumentMatchers, Mockito }
-import scala.jdk.CollectionConverters._
import scala.collection.immutable.Seq
import scala.concurrent.duration._
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerProgressTrackingSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerProgressTrackingSpec.scala
index 8d493b0c..9fbe61c4 100644
---
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerProgressTrackingSpec.scala
+++
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerProgressTrackingSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.kafka.internal
-import org.apache.pekko.kafka.tests.scaladsl.LogCapturing
+import org.apache.pekko
+import pekko.kafka.tests.scaladsl.LogCapturing
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ Consumer, ConsumerRecord,
ConsumerRecords, OffsetAndMetadata }
import org.apache.kafka.common.TopicPartition
import org.mockito.Mockito
import org.scalatest.flatspec.AnyFlatSpecLike
import org.scalatest.matchers.should.Matchers
-import scala.jdk.CollectionConverters._
import scala.language.reflectiveCalls
class ConsumerProgressTrackingSpec extends AnyFlatSpecLike with Matchers with
LogCapturing {
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerResetProtectionSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerResetProtectionSpec.scala
index b5d5c9eb..37ceaa16 100644
---
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerResetProtectionSpec.scala
+++
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerResetProtectionSpec.scala
@@ -22,6 +22,7 @@ import pekko.kafka.internal.KafkaConsumerActor.Internal.Seek
import pekko.kafka.testkit.scaladsl.Slf4jToAkkaLoggingAdapter
import pekko.kafka.tests.scaladsl.LogCapturing
import pekko.testkit.{ ImplicitSender, TestKit }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerRecord, ConsumerRecords }
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.header.internals.RecordHeaders
@@ -32,7 +33,6 @@ import org.slf4j.{ Logger, LoggerFactory }
import java.util.Optional
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
class ConsumerResetProtectionSpec
extends TestKit(ActorSystem("ConsumerResetProtectionSpec"))
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala
index af77a6ef..d5f1b610 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala
@@ -26,6 +26,7 @@ import pekko.stream.scaladsl._
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
import pekko.testkit.TestKit
+import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.ConfigFactory
import org.apache.kafka.clients.consumer._
import org.apache.kafka.common.serialization.StringDeserializer
@@ -38,7 +39,6 @@ import org.scalatest.matchers.should.Matchers
import scala.collection.immutable.Seq
import scala.concurrent.duration._
import scala.concurrent.{ Await, Future }
-import scala.jdk.CollectionConverters._
object ConsumerSpec {
type K = String
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/PartitionedSourceSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/PartitionedSourceSpec.scala
index 01c43089..fb70f488 100644
---
a/tests/src/test/scala/org/apache/pekko/kafka/internal/PartitionedSourceSpec.scala
+++
b/tests/src/test/scala/org/apache/pekko/kafka/internal/PartitionedSourceSpec.scala
@@ -29,6 +29,7 @@ import pekko.stream.scaladsl._
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
import pekko.testkit.TestKit
+import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.ConfigFactory
import org.apache.kafka.clients.consumer._
import org.apache.kafka.common.TopicPartition
@@ -41,7 +42,6 @@ import org.slf4j.{ Logger, LoggerFactory }
import scala.concurrent.Future
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
class PartitionedSourceSpec(_system: ActorSystem)
extends TestKit(_system)
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/internal/ProducerSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/internal/ProducerSpec.scala
index d61583b2..1e7633f5 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/ProducerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/ProducerSpec.scala
@@ -28,6 +28,7 @@ import pekko.stream.testkit.scaladsl.{ TestSink, TestSource }
import pekko.stream.{ ActorAttributes, Supervision }
import pekko.testkit.TestKit
import pekko.{ Done, NotUsed }
+import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.ConfigFactory
import org.apache.kafka.clients.consumer.{ ConsumerGroupMetadata,
OffsetAndMetadata }
import org.apache.kafka.clients.producer._
@@ -45,7 +46,6 @@ import org.scalatest.matchers.should.Matchers
import scala.concurrent.duration._
import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
-import scala.jdk.CollectionConverters._
import scala.util.{ Failure, Success, Try }
class ProducerSpec(_system: ActorSystem)
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala
index f39afe0f..5b2d457a 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala
@@ -26,6 +26,7 @@ import
pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
import pekko.testkit.TestProbe
import pekko.{ Done, NotUsed }
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.clients.consumer.{ ConsumerConfig,
ConsumerPartitionAssignor, ConsumerRecord }
import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignor
import org.apache.kafka.common.TopicPartition
@@ -33,7 +34,6 @@ import org.scalatest.Inside
import org.slf4j.{ Logger, LoggerFactory }
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
import scala.util.Random
class RebalanceSpec extends SpecBase with TestcontainersKafkaLike with Inside {
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
index 116fb8f0..20bbe227 100644
---
a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
+++
b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala
@@ -24,10 +24,10 @@ import
pekko.kafka.testkit.scaladsl.TestcontainersKafkaPerClassLike
import pekko.stream.scaladsl.Keep
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
+import pekko.util.ccompat.JavaConverters._
import scala.concurrent.Await
import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
class RetentionPeriodSpec extends SpecBase with
TestcontainersKafkaPerClassLike {
private final val confluentPlatformVersion = "5.0.0"
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala
b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala
index 9eb039eb..aeed1351 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala
@@ -19,11 +19,11 @@ import pekko.kafka.testkit.scaladsl.TestcontainersKafkaLike
import pekko.kafka.Subscriptions
import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
+import pekko.util.ccompat.JavaConverters._
import org.apache.kafka.common.TopicPartition
import org.scalatest.Inside
import org.scalatest.concurrent.IntegrationPatience
-import scala.jdk.CollectionConverters._
import scala.concurrent.Await
import scala.concurrent.duration._
diff --git
a/tests/src/test/scala/org/apache/pekko/kafka/tests/CapturingAppender.scala
b/tests/src/test/scala/org/apache/pekko/kafka/tests/CapturingAppender.scala
index a89a503a..139effab 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/tests/CapturingAppender.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/tests/CapturingAppender.scala
@@ -85,7 +85,7 @@ import ch.qos.logback.core.AppenderBase
* Also clears the buffer..
*/
def flush(): Unit = synchronized {
- import scala.jdk.CollectionConverters._
+ import pekko.util.ccompat.JavaConverters._
val logbackLogger = getLogbackLogger(classOf[CapturingAppender].getName +
"Delegate")
val appenders = logbackLogger.iteratorForAppenders().asScala.filterNot(_
== this).toList
for (event <- buffer; appender <- appenders) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
