You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/03/17 12:25:50 UTC
[incubator-pekko-connectors] branch main updated: Use Pekko Java/Scala converters to remove warnings
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.git
The following commit(s) were added to refs/heads/main by this push:
new 76640dcf8 Use Pekko Java/Scala converters to remove warnings
76640dcf8 is described below
commit 76640dcf8a95e38ac438b8cbf09ac50a9ea89a4d
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Fri Mar 17 12:49:36 2023 +0100
Use Pekko Java/Scala converters to remove warnings
---
.../pekko/stream/connectors/amqp/AmqpConnectionProvider.scala | 6 +++---
.../apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala | 2 +-
.../pekko/stream/connectors/amqp/impl/AmqpConnectorLogic.scala | 2 +-
.../apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala | 2 +-
.../connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala | 2 +-
.../src/test/scala/docs/scaladsl/AzureQueueSpec.scala | 2 +-
.../stream/connectors/cassandra/CassandraMetricsRegistry.scala | 2 +-
.../stream/connectors/cassandra/javadsl/CassandraSession.scala | 2 +-
.../pekko/stream/connectors/cassandra/scaladsl/CassandraFlow.scala | 2 +-
.../connectors/cassandra/scaladsl/CassandraSessionRegistry.scala | 2 +-
cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala | 2 +-
.../stream/connectors/cassandra/scaladsl/CassandraLifecycle.scala | 2 +-
.../scala/org/apache/pekko/stream/connectors/couchbase/model.scala | 2 +-
.../stream/connectors/couchbase/testing/CouchbaseSupport.scala | 2 +-
.../org/apache/pekko/stream/connectors/dynamodb/ItemSpec.scala | 2 +-
.../org/apache/pekko/stream/connectors/dynamodb/TableSpec.scala | 2 +-
.../scala/org/apache/pekko/stream/connectors/dynamodb/TestOps.scala | 2 +-
.../connectors/elasticsearch/ElasticsearchConnectionSettings.scala | 2 +-
.../apache/pekko/stream/connectors/elasticsearch/WriteMessage.scala | 2 +-
.../stream/connectors/elasticsearch/javadsl/ElasticsearchFlow.scala | 2 +-
.../connectors/elasticsearch/javadsl/ElasticsearchSource.scala | 2 +-
.../pekko/stream/connectors/file/javadsl/LogRotatorSink.scala | 2 +-
file/src/test/scala/docs/scaladsl/ArchiveSpec.scala | 2 +-
file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala | 2 +-
.../apache/pekko/stream/connectors/ftp/impl/SftpOperations.scala | 2 +-
.../googlecloud/bigquery/storage/ProtobufConverters.scala | 2 +-
.../connectors/googlecloud/bigquery/storage/impl/ArrowSource.scala | 2 +-
.../googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala | 2 +-
.../googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala | 2 +-
.../googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala | 2 +-
.../bigquery/storage/javadsl/AvroByteStringDecoder.scala | 2 +-
.../bigquery/storage/scaladsl/ArrowByteStringDecoder.scala | 2 +-
.../stream/connectors/googlecloud/bigquery/javadsl/BigQuery.scala | 2 +-
.../connectors/googlecloud/bigquery/model/DatasetJsonProtocol.scala | 2 +-
.../connectors/googlecloud/bigquery/model/JobJsonProtocol.scala | 2 +-
.../connectors/googlecloud/bigquery/model/QueryJsonProtocol.scala | 2 +-
.../googlecloud/bigquery/model/TableDataJsonProtocol.scala | 2 +-
.../connectors/googlecloud/bigquery/model/TableJsonProtocol.scala | 2 +-
.../apache/pekko/stream/connectors/googlecloud/bigquery/e2e/A.scala | 2 +-
.../googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala | 2 +-
.../stream/connectors/googlecloud/pubsub/javadsl/GooglePubSub.scala | 2 +-
.../apache/pekko/stream/connectors/googlecloud/pubsub/model.scala | 2 +-
.../pekko/stream/connectors/googlecloud/storage/FailedUpload.scala | 2 +-
.../pekko/stream/connectors/googlecloud/storage/StorageObject.scala | 2 +-
.../stream/connectors/googlecloud/storage/javadsl/GCStorage.scala | 2 +-
.../pekko/stream/connectors/googlecloud/storage/GCSExtSpec.scala | 2 +-
.../stream/connectors/googlecloud/storage/GCSSettingsSpec.scala | 2 +-
.../stream/connectors/googlecloud/storage/GCStorageExtSpec.scala | 2 +-
.../connectors/googlecloud/storage/GCStorageSettingsSpec.scala | 2 +-
.../stream/connectors/google/auth/ServiceAccountCredentials.scala | 2 +-
.../org/apache/pekko/stream/connectors/hbase/HTableSettings.scala | 2 +-
.../org/apache/pekko/stream/connectors/hdfs/util/TestUtils.scala | 2 +-
.../stream/connectors/influxdb/impl/AlpakkaResultMapperHelper.scala | 2 +-
.../pekko/stream/connectors/influxdb/impl/InfluxDbSourceStage.scala | 2 +-
.../pekko/stream/connectors/influxdb/javadsl/InfluxDbFlow.scala | 2 +-
influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala | 2 +-
.../scala/org/apache/pekko/stream/connectors/jms/JmsMessages.scala | 2 +-
.../apache/pekko/stream/connectors/jms/impl/JmsMessageReader.scala | 2 +-
.../apache/pekko/stream/connectors/jms/javadsl/JmsConsumer.scala | 2 +-
.../apache/pekko/stream/connectors/jms/javadsl/JmsProducer.scala | 2 +-
.../apache/pekko/stream/connectors/jms/scaladsl/JmsConsumer.scala | 2 +-
jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala | 2 +-
.../pekko/stream/connectors/kinesis/impl/KinesisSourceStage.scala | 2 +-
.../pekko/stream/connectors/kinesis/impl/ShardProcessor.scala | 2 +-
.../pekko/stream/connectors/kinesis/javadsl/KinesisSource.scala | 2 +-
.../pekko/stream/connectors/kinesis/scaladsl/KinesisFlow.scala | 2 +-
.../connectors/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala | 2 +-
.../apache/pekko/stream/connectors/kinesis/KinesisFlowSpec.scala | 2 +-
.../stream/connectors/kinesis/KinesisSchedulerSourceSpec.scala | 2 +-
.../stream/connectors/kinesisfirehose/KinesisFirehoseFlowSpec.scala | 2 +-
.../apache/pekko/stream/connectors/kudu/impl/KuduFlowStage.scala | 2 +-
kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala | 2 +-
.../apache/pekko/stream/connectors/mongodb/javadsl/MongoFlow.scala | 2 +-
.../apache/pekko/stream/connectors/mongodb/scaladsl/MongoFlow.scala | 2 +-
mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala | 2 +-
mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala | 2 +-
.../org/apache/pekko/stream/connectors/mqtt/streaming/model.scala | 2 +-
.../scala/org/apache/pekko/stream/connectors/mqtt/settings.scala | 2 +-
.../pekko/stream/connectors/orientdb/impl/OrientDbSourceStage.scala | 2 +-
.../pekko/stream/connectors/orientdb/javadsl/OrientDbFlow.scala | 2 +-
.../scala/org/apache/pekko/stream/connectors/reference/model.scala | 2 +-
.../pekko/stream/connectors/reference/testkit/MessageFactory.scala | 2 +-
.../org/apache/pekko/stream/connectors/s3/scaladsl/S3ExtSpec.scala | 2 +-
.../pekko/stream/connectors/s3/scaladsl/S3IntegrationSpec.scala | 2 +-
.../org/apache/pekko/stream/connectors/solr/SolrMessages.scala | 2 +-
.../apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala | 2 +-
.../org/apache/pekko/stream/connectors/solr/javadsl/SolrFlow.scala | 2 +-
.../org/apache/pekko/stream/connectors/sqs/SqsSourceSettings.scala | 2 +-
.../apache/pekko/stream/connectors/sqs/javadsl/SqsPublishFlow.scala | 2 +-
.../apache/pekko/stream/connectors/sqs/javadsl/SqsPublishSink.scala | 2 +-
.../apache/pekko/stream/connectors/sqs/scaladsl/SqsAckFlow.scala | 2 +-
.../pekko/stream/connectors/sqs/scaladsl/SqsPublishFlow.scala | 2 +-
.../org/apache/pekko/stream/connectors/sqs/scaladsl/SqsSource.scala | 2 +-
sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala | 2 +-
sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala | 2 +-
sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala | 2 +-
.../pekko/stream/connectors/sqs/scaladsl/DefaultTestContext.scala | 2 +-
.../apache/pekko/stream/connectors/testkit/CapturingAppender.scala | 2 +-
text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala | 2 +-
.../stream/connectors/text/scaladsl/CharsetCodingFlowsSpec.scala | 2 +-
.../org/apache/pekko/stream/connectors/xml/javadsl/XmlParsing.scala | 2 +-
.../main/scala/org/apache/pekko/stream/connectors/xml/model.scala | 2 +-
102 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala
index 965a3ccf2..2d04dd95c 100644
--- a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala
+++ b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala
@@ -23,7 +23,7 @@ import javax.net.ssl.{ SSLContext, TrustManager }
import scala.annotation.tailrec
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Only for internal implementations
@@ -131,7 +131,7 @@ final class AmqpDetailsConnectionProvider private (
copy(connectionName = Option(name))
override def get: Connection = {
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val factory = new ConnectionFactory
credentials.foreach { credentials =>
factory.setUsername(credentials.username)
@@ -339,7 +339,7 @@ final class AmqpConnectionFactoryConnectionProvider private (val factory: Connec
copy(hostAndPorts = hostAndPorts.asScala.map(_.toScala).toIndexedSeq)
override def get: Connection = {
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
factory.newConnection(hostAndPortList.map(hp => new Address(hp._1, hp._2)).asJava)
}
diff --git a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala
index 6e1834d0a..0fca5ceca 100644
--- a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala
+++ b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala
@@ -17,7 +17,7 @@ import org.apache.pekko
import pekko.annotation.InternalApi
import pekko.util.JavaDurationConverters._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.concurrent.duration._
diff --git a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpConnectorLogic.scala b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpConnectorLogic.scala
index 50bf3866f..f9b91ff00 100644
--- a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpConnectorLogic.scala
+++ b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpConnectorLogic.scala
@@ -42,7 +42,7 @@ private trait AmqpConnectorLogic { this: GraphStageLogic =>
connection.addShutdownListener(shutdownListener)
channel.addShutdownListener(shutdownListener)
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
settings.declarations.foreach {
case d: QueueDeclaration =>
diff --git a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala
index 4fc60ed47..4cce68bbf 100644
--- a/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala
+++ b/amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala
@@ -60,7 +60,7 @@ private[amqp] final class AmqpSourceStage(settings: AmqpSourceSettings, bufferSi
private var unackedMessages = 0
override def whenConnected(): Unit = {
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
channel.basicQos(bufferSize)
val consumerCallback = getAsyncCallback(handleDelivery)
diff --git a/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala b/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala
index 8de95ee38..ef86b8e06 100644
--- a/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala
+++ b/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala
@@ -45,7 +45,7 @@ import scala.collection.mutable.Queue
retrieveMessages()
def retrieveMessages(): Unit = {
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val res = cloudQueueBuilt
.retrieveMessages(settings.batchSize, settings.initialVisibilityTimeout, null, null)
.asScala
diff --git a/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala b/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala
index a015ebb6f..ec8d56a51 100644
--- a/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala
+++ b/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala
@@ -25,7 +25,7 @@ import com.microsoft.azure.storage._
import com.microsoft.azure.storage.queue._
import org.scalatest._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent._
import scala.concurrent.duration._
import scala.util.Properties
diff --git a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/CassandraMetricsRegistry.scala b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/CassandraMetricsRegistry.scala
index df2f4fc00..3dacf5b5f 100644
--- a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/CassandraMetricsRegistry.scala
+++ b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/CassandraMetricsRegistry.scala
@@ -18,7 +18,7 @@ import pekko.actor.{ ClassicActorSystemProvider, ExtendedActorSystem, Extension,
import pekko.annotation.InternalApi
import com.codahale.metrics.MetricRegistry
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Retrieves Cassandra metrics registry for an actor system
diff --git a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSession.scala b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSession.scala
index dc4bba211..b097c50d0 100644
--- a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSession.scala
+++ b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSession.scala
@@ -19,7 +19,7 @@ import java.util.concurrent.{ CompletionStage, Executor }
import java.util.function.{ Function => JFunction }
import scala.annotation.varargs
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters._
import scala.compat.java8.OptionConverters._
import scala.concurrent.ExecutionContext
diff --git a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraFlow.scala b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraFlow.scala
index 5a3816120..f2ca92724 100644
--- a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraFlow.scala
+++ b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraFlow.scala
@@ -20,7 +20,7 @@ import pekko.stream.connectors.cassandra.CassandraWriteSettings
import pekko.stream.scaladsl.{ Flow, FlowWithContext }
import com.datastax.oss.driver.api.core.cql.{ BatchStatement, BoundStatement, PreparedStatement }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.Future
/**
diff --git a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionRegistry.scala b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionRegistry.scala
index d08b15fb1..8c223bc07 100644
--- a/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionRegistry.scala
+++ b/cassandra/src/main/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionRegistry.scala
@@ -15,7 +15,7 @@ package org.apache.pekko.stream.connectors.cassandra.scaladsl
import java.util.concurrent.ConcurrentHashMap
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
import org.apache.pekko
diff --git a/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala b/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala
index 13ec300e9..b15e60b97 100644
--- a/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala
+++ b/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala
@@ -29,7 +29,7 @@ import pekko.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
import pekko.stream.testkit.scaladsl.TestSink
import com.datastax.oss.driver.api.core.cql.Row
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.compat.java8.FutureConverters._
import scala.compat.java8.OptionConverters._
diff --git a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraLifecycle.scala b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraLifecycle.scala
index 43a720917..eb402efcc 100644
--- a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraLifecycle.scala
+++ b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraLifecycle.scala
@@ -23,7 +23,7 @@ import com.datastax.oss.driver.api.core.cql._
import org.scalatest._
import org.scalatest.concurrent.{ PatienceConfiguration, ScalaFutures }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.concurrent.duration._
import scala.concurrent.{ Await, Future }
diff --git a/couchbase/src/main/scala/org/apache/pekko/stream/connectors/couchbase/model.scala b/couchbase/src/main/scala/org/apache/pekko/stream/connectors/couchbase/model.scala
index 023c1623d..ac5ece680 100644
--- a/couchbase/src/main/scala/org/apache/pekko/stream/connectors/couchbase/model.scala
+++ b/couchbase/src/main/scala/org/apache/pekko/stream/connectors/couchbase/model.scala
@@ -23,7 +23,7 @@ import com.couchbase.client.java.env.CouchbaseEnvironment
import com.couchbase.client.java.{ PersistTo, ReplicateTo }
import com.typesafe.config.Config
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.concurrent.Future
import scala.compat.java8.FutureConverters._
diff --git a/couchbase/src/test/scala/org/apache/pekko/stream/connectors/couchbase/testing/CouchbaseSupport.scala b/couchbase/src/test/scala/org/apache/pekko/stream/connectors/couchbase/testing/CouchbaseSupport.scala
index 8a8d204cd..3b6cb62b5 100644
--- a/couchbase/src/test/scala/org/apache/pekko/stream/connectors/couchbase/testing/CouchbaseSupport.scala
+++ b/couchbase/src/test/scala/org/apache/pekko/stream/connectors/couchbase/testing/CouchbaseSupport.scala
@@ -27,7 +27,7 @@ import com.couchbase.client.java.document.{ BinaryDocument, JsonDocument, RawJso
import org.slf4j.LoggerFactory
import play.api.libs.json.Json
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
diff --git a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/ItemSpec.scala b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/ItemSpec.scala
index d34763eef..2dd62ac1d 100644
--- a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/ItemSpec.scala
+++ b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/ItemSpec.scala
@@ -29,7 +29,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
import software.amazon.awssdk.services.dynamodb.model.TableStatus
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.ExecutionContext
class ItemSpec extends TestKit(ActorSystem("ItemSpec")) with AsyncWordSpecLike with Matchers with BeforeAndAfterAll {
diff --git a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TableSpec.scala b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TableSpec.scala
index 70ddcf92e..16f0775b8 100644
--- a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TableSpec.scala
+++ b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TableSpec.scala
@@ -25,7 +25,7 @@ import software.amazon.awssdk.auth.credentials.{ AwsBasicCredentials, StaticCred
import software.amazon.awssdk.regions.Region
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AsyncWordSpecLike
diff --git a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TestOps.scala b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TestOps.scala
index 621240851..99d39e1c5 100644
--- a/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TestOps.scala
+++ b/dynamodb/src/test/scala/org/apache/pekko/stream/connectors/dynamodb/TestOps.scala
@@ -15,7 +15,7 @@ package org.apache.pekko.stream.connectors.dynamodb
import software.amazon.awssdk.services.dynamodb.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
trait TestOps {
diff --git a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
index 0953dcfe3..bb20f7196 100644
--- a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
+++ b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
@@ -19,7 +19,7 @@ import pekko.http.scaladsl.model.HttpHeader
import pekko.http.scaladsl.model.HttpHeader.ParsingResult
import pekko.japi.Util
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import javax.net.ssl.SSLContext
import scala.compat.java8.OptionConverters
diff --git a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/WriteMessage.scala b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/WriteMessage.scala
index adb0acedc..b6a28bf9c 100644
--- a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/WriteMessage.scala
+++ b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/WriteMessage.scala
@@ -17,7 +17,7 @@ import org.apache.pekko
import pekko.NotUsed
import pekko.annotation.InternalApi
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.OptionConverters._
/**
diff --git a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchFlow.scala b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchFlow.scala
index 23300f56a..f339fa031 100644
--- a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchFlow.scala
+++ b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchFlow.scala
@@ -19,7 +19,7 @@ import pekko.annotation.ApiMayChange
import pekko.stream.connectors.elasticsearch.{ scaladsl, _ }
import com.fasterxml.jackson.databind.ObjectMapper
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Java API to create Elasticsearch flows.
diff --git a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchSource.scala b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchSource.scala
index 39e21b8a6..4e3ca24b6 100644
--- a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchSource.scala
+++ b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/javadsl/ElasticsearchSource.scala
@@ -23,7 +23,7 @@ import pekko.stream.{ Attributes, Materializer }
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.node.{ ArrayNode, NumericNode }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.ExecutionContext
/**
diff --git a/file/src/main/scala/org/apache/pekko/stream/connectors/file/javadsl/LogRotatorSink.scala b/file/src/main/scala/org/apache/pekko/stream/connectors/file/javadsl/LogRotatorSink.scala
index 4d7911934..ed90fe188 100644
--- a/file/src/main/scala/org/apache/pekko/stream/connectors/file/javadsl/LogRotatorSink.scala
+++ b/file/src/main/scala/org/apache/pekko/stream/connectors/file/javadsl/LogRotatorSink.scala
@@ -25,7 +25,7 @@ import pekko.stream.javadsl.Sink
import pekko.util.ByteString
import pekko.japi.function
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.Future
import scala.compat.java8.FutureConverters._
diff --git a/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala b/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala
index 7f87b9435..8f7d7a440 100644
--- a/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala
+++ b/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala
@@ -30,7 +30,7 @@ import org.scalatest.concurrent.{ IntegrationPatience, ScalaFutures }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.{ ExecutionContext, Future }
class ArchiveSpec
diff --git a/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala b/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala
index a2280be53..0050eb6c9 100644
--- a/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala
+++ b/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala
@@ -32,7 +32,7 @@ import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.concurrent.{ ExecutionContext, Future }
diff --git a/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/SftpOperations.scala b/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/SftpOperations.scala
index 1271ae7f9..ef643b700 100644
--- a/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/SftpOperations.scala
+++ b/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/SftpOperations.scala
@@ -28,7 +28,7 @@ import net.schmizz.sshj.userauth.password.{ PasswordFinder, PasswordUtils, Resou
import net.schmizz.sshj.xfer.FilePermission
import org.apache.commons.net.DefaultSocketFactory
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.util.{ Failure, Try }
diff --git a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/ProtobufConverters.scala b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/ProtobufConverters.scala
index 7cb91414d..bf4db3069 100644
--- a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/ProtobufConverters.scala
+++ b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/ProtobufConverters.scala
@@ -18,7 +18,7 @@ import com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions
import com.google.cloud.bigquery.storage.v1.stream.ReadSession
import scalapb.UnknownFieldSet
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Internal API
diff --git a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/impl/ArrowSource.scala b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/impl/ArrowSource.scala
index 7db8fa5cd..4a703a603 100644
--- a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/impl/ArrowSource.scala
+++ b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/impl/ArrowSource.scala
@@ -28,7 +28,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel
import scala.collection.mutable
import scala.collection.mutable.ListBuffer
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object ArrowSource {
diff --git a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala
index 3a2112882..423cbdef1 100644
--- a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala
+++ b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala
@@ -22,7 +22,7 @@ import pekko.stream.connectors.googlecloud.bigquery.storage.{ scaladsl => scstor
import com.google.cloud.bigquery.storage.v1.arrow.{ ArrowRecordBatch, ArrowSchema }
import java.util.concurrent.CompletionStage
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters.FutureOps
/**
diff --git a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala
index a7698eab1..059add957 100644
--- a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala
+++ b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala
@@ -21,7 +21,7 @@ import com.google.cloud.bigquery.storage.v1.avro.{ AvroRows, AvroSchema }
import com.google.cloud.bigquery.storage.v1.stream.ReadSession.TableReadOptions
import java.util.concurrent.CompletionStage
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters.FutureOps
/**
diff --git a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala
index 1a9c4b49a..206c47bd5 100644
--- a/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala
+++ b/google-cloud-bigquery-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala
@@ -28,7 +28,7 @@ import com.google.cloud.bigquery.storage.v1.stream.ReadSession
import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters.FutureOps
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Google BigQuery Storage Api Akka Stream operator factory.
diff --git a/google-cloud-bigquery-storage/src/test/java/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala b/google-cloud-bigquery-storage/src/test/java/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala
index a6fb8948c..03e55cad4 100644
--- a/google-cloud-bigquery-storage/src/test/java/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala
+++ b/google-cloud-bigquery-storage/src/test/java/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala
@@ -26,7 +26,7 @@ import org.apache.avro.io.DecoderFactory
import java.util
import scala.collection.mutable.ListBuffer
import scala.concurrent.{ ExecutionContext, Future }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class AvroByteStringDecoder(schema: Schema) extends FromByteStringUnmarshaller[java.util.List[BigQueryRecord]] {
diff --git a/google-cloud-bigquery-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala b/google-cloud-bigquery-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala
index 844709e38..fd36e1a1e 100644
--- a/google-cloud-bigquery-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala
+++ b/google-cloud-bigquery-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala
@@ -28,7 +28,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel
import scala.collection.mutable
import scala.collection.mutable.ListBuffer
import scala.concurrent.{ ExecutionContext, Future }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class ArrowByteStringDecoder(val schema: ArrowSchema) extends FromByteStringUnmarshaller[List[BigQueryRecord]] {
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/javadsl/BigQuery.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/javadsl/BigQuery.scala
index 977df81ea..1b207e70a 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/javadsl/BigQuery.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/javadsl/BigQuery.scala
@@ -44,7 +44,7 @@ import java.util.concurrent.CompletionStage
import java.{ lang, util }
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters._
import scala.compat.java8.OptionConverters._
import scala.concurrent.duration.{ FiniteDuration, MILLISECONDS }
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/DatasetJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/DatasetJsonProtocol.scala
index 2f635d54f..04d01dab7 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/DatasetJsonProtocol.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/DatasetJsonProtocol.scala
@@ -19,7 +19,7 @@ import pekko.stream.connectors.googlecloud.bigquery.scaladsl.spray.BigQueryRestJ
import spray.json.{ JsonFormat, RootJsonFormat }
import java.util
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.OptionConverters._
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/JobJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/JobJsonProtocol.scala
index 2d91806de..257a948a0 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/JobJsonProtocol.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/JobJsonProtocol.scala
@@ -20,7 +20,7 @@ import spray.json.{ JsonFormat, RootJsonFormat }
import java.util
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.OptionConverters._
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/QueryJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/QueryJsonProtocol.scala
index 35a32a015..7b529994b 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/QueryJsonProtocol.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/QueryJsonProtocol.scala
@@ -26,7 +26,7 @@ import java.{ lang, util }
import scala.annotation.nowarn
import scala.annotation.unchecked.uncheckedVariance
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.OptionConverters._
import scala.concurrent.duration.FiniteDuration
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableDataJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableDataJsonProtocol.scala
index 41da8f3f9..fea502bd2 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableDataJsonProtocol.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableDataJsonProtocol.scala
@@ -25,7 +25,7 @@ import java.{ lang, util }
import scala.annotation.nowarn
import scala.annotation.unchecked.uncheckedVariance
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.OptionConverters._
diff --git a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableJsonProtocol.scala
index 6aea262f9..248468af2 100644
--- a/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableJsonProtocol.scala
+++ b/google-cloud-bigquery/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/model/TableJsonProtocol.scala
@@ -25,7 +25,7 @@ import scala.annotation.nowarn
import scala.annotation.varargs
import scala.collection.immutable.Seq
import scala.compat.java8.OptionConverters._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Table resource model
diff --git a/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/A.scala b/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/A.scala
index 4d802fb7a..673cf4938 100644
--- a/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/A.scala
+++ b/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/A.scala
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
import java.time.{ Instant, LocalDate, LocalDateTime, LocalTime }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
@JsonPropertyOrder(alphabetic = true)
case class A(integer: Int, long: Long, float: Float, double: Double, string: String, boolean: Boolean, record: B) {
diff --git a/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala b/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala
index 4ace089b9..6652bff58 100644
--- a/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala
+++ b/google-cloud-bigquery/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala
@@ -14,7 +14,7 @@
package org.apache.pekko.stream.connectors.googlecloud.bigquery.e2e.javadsl
import org.apache.pekko.stream.connectors.googlecloud.bigquery.e2e.scaladsl
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
abstract class EndToEndHelper extends scaladsl.EndToEndHelper {
diff --git a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/javadsl/GooglePubSub.scala b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/javadsl/GooglePubSub.scala
index 254352b0d..d85860912 100644
--- a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/javadsl/GooglePubSub.scala
+++ b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/javadsl/GooglePubSub.scala
@@ -23,7 +23,7 @@ import pekko.{ Done, NotUsed }
import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
import scala.concurrent.Future
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Java DSL for Google Pub/Sub
diff --git a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
index 46764a59a..1485a7b48 100644
--- a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
+++ b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
@@ -22,7 +22,7 @@ import pekko.stream.connectors.google.auth.ServiceAccountCredentials
import scala.annotation.nowarn
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* @param projectId (deprecated) the project Id in the google account
diff --git a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/FailedUpload.scala b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/FailedUpload.scala
index 36c61e9f4..0d04e58be 100644
--- a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/FailedUpload.scala
+++ b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/FailedUpload.scala
@@ -14,7 +14,7 @@
package org.apache.pekko.stream.connectors.googlecloud.storage
import scala.collection.immutable.Seq
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
final class FailedUpload private (
val reasons: Seq[Throwable]) extends Exception(reasons.map(_.getMessage).mkString(", ")) {
diff --git a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/StorageObject.scala b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/StorageObject.scala
index 2363e7fda..4ad816d1b 100644
--- a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/StorageObject.scala
+++ b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/StorageObject.scala
@@ -19,7 +19,7 @@ import java.util.Optional
import org.apache.pekko
import pekko.http.scaladsl.model.ContentType
import scala.compat.java8.OptionConverters._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Represents an object within Google Cloud Storage.
diff --git a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
index de6e525f3..3852d1a73 100644
--- a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
+++ b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
@@ -27,7 +27,7 @@ import pekko.stream.{ Attributes, Materializer }
import pekko.util.ByteString
import pekko.{ Done, NotUsed }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters._
import scala.compat.java8.OptionConverters._
diff --git a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSExtSpec.scala b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSExtSpec.scala
index 425f3003e..ed3bee8fc 100644
--- a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSExtSpec.scala
+++ b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSExtSpec.scala
@@ -20,7 +20,7 @@ import com.typesafe.config.ConfigFactory
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class GCSExtSpec extends AnyFlatSpec with Matchers with LogCapturing {
"GCSExt" should "reuse application config from actor system" in {
diff --git a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSSettingsSpec.scala b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSSettingsSpec.scala
index f07dde071..64b41c312 100644
--- a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSSettingsSpec.scala
+++ b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCSSettingsSpec.scala
@@ -18,7 +18,7 @@ import com.typesafe.config.ConfigFactory
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class GCSSettingsSpec extends AnyFlatSpec with Matchers with LogCapturing {
"GCSSettings" should "create settings from application config" in {
diff --git a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageExtSpec.scala b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageExtSpec.scala
index 54ad3eef5..58b9aff0c 100644
--- a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageExtSpec.scala
+++ b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageExtSpec.scala
@@ -21,7 +21,7 @@ import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class GCStorageExtSpec extends AnyFlatSpec with Matchers with LogCapturing {
"GCStorageExt" should "reuse application config from actor system" in {
diff --git a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageSettingsSpec.scala b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageSettingsSpec.scala
index ae267f773..95355af9c 100644
--- a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageSettingsSpec.scala
+++ b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/GCStorageSettingsSpec.scala
@@ -19,7 +19,7 @@ import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class GCStorageSettingsSpec extends AnyFlatSpec with Matchers with LogCapturing {
"GCStorageSettings" should "create settings from application config" in {
diff --git a/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/auth/ServiceAccountCredentials.scala b/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/auth/ServiceAccountCredentials.scala
index 9160f8188..2c0a439ef 100644
--- a/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/auth/ServiceAccountCredentials.scala
+++ b/google-common/src/main/scala/org/apache/pekko/stream/connectors/google/auth/ServiceAccountCredentials.scala
@@ -23,7 +23,7 @@ import spray.json.DefaultJsonProtocol._
import spray.json.{ JsonParser, RootJsonFormat }
import java.time.Clock
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.Future
import scala.io.Source
diff --git a/hbase/src/main/scala/org/apache/pekko/stream/connectors/hbase/HTableSettings.scala b/hbase/src/main/scala/org/apache/pekko/stream/connectors/hbase/HTableSettings.scala
index 118415093..6ac0c875e 100644
--- a/hbase/src/main/scala/org/apache/pekko/stream/connectors/hbase/HTableSettings.scala
+++ b/hbase/src/main/scala/org/apache/pekko/stream/connectors/hbase/HTableSettings.scala
@@ -18,7 +18,7 @@ import org.apache.hadoop.hbase.TableName
import org.apache.hadoop.hbase.client.Mutation
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FunctionConverters._
final class HTableSettings[T] private (val conf: Configuration,
diff --git a/hdfs/src/test/scala/org/apache/pekko/stream/connectors/hdfs/util/TestUtils.scala b/hdfs/src/test/scala/org/apache/pekko/stream/connectors/hdfs/util/TestUtils.scala
index 981cd24bd..6e2650211 100644
--- a/hdfs/src/test/scala/org/apache/pekko/stream/connectors/hdfs/util/TestUtils.scala
+++ b/hdfs/src/test/scala/org/apache/pekko/stream/connectors/hdfs/util/TestUtils.scala
@@ -187,7 +187,7 @@ object JavaTestUtils extends TestUtils {
import org.junit.Assert._
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val books: util.List[ByteString] = ScalaTestUtils.books.asJava
diff --git a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/AlpakkaResultMapperHelper.scala b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/AlpakkaResultMapperHelper.scala
index aecbe8304..79ceeb2d6 100644
--- a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/AlpakkaResultMapperHelper.scala
+++ b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/AlpakkaResultMapperHelper.scala
@@ -26,7 +26,7 @@ import org.apache.pekko.annotation.InternalApi
import org.influxdb.InfluxDBMapperException
import org.influxdb.dto.Point
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Internal API.
diff --git a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/InfluxDbSourceStage.scala b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/InfluxDbSourceStage.scala
index 8ad99363e..cf4d9c0bd 100644
--- a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/InfluxDbSourceStage.scala
+++ b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/impl/InfluxDbSourceStage.scala
@@ -21,7 +21,7 @@ import pekko.stream.stage.{ GraphStage, GraphStageLogic, OutHandler }
import org.influxdb.{ InfluxDB, InfluxDBException }
import org.influxdb.dto.{ Query, QueryResult }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* INTERNAL API
diff --git a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/javadsl/InfluxDbFlow.scala b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/javadsl/InfluxDbFlow.scala
index f01aea85a..34b15ed3a 100644
--- a/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/javadsl/InfluxDbFlow.scala
+++ b/influxdb/src/main/scala/org/apache/pekko/stream/connectors/influxdb/javadsl/InfluxDbFlow.scala
@@ -22,7 +22,7 @@ import pekko.stream.javadsl.Flow
import pekko.stream.connectors.influxdb.scaladsl
import org.influxdb.dto.Point
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* API may change.
diff --git a/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala b/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala
index 26d77cd7b..c8ec69701 100644
--- a/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala
+++ b/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala
@@ -27,7 +27,7 @@ import pekko.stream.connectors.testkit.scaladsl.LogCapturing
import pekko.testkit.TestKit
import pekko.stream.scaladsl.Sink
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import docs.javadsl.TestUtils._
import docs.javadsl.TestConstants.{ INFLUXDB_URL, PASSWORD, USERNAME }
import org.scalatest.matchers.must.Matchers
diff --git a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsMessages.scala b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsMessages.scala
index 49d173fbc..8645654b8 100644
--- a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsMessages.scala
+++ b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsMessages.scala
@@ -19,7 +19,7 @@ import org.apache.pekko
import pekko.NotUsed
import pekko.stream.connectors.jms.impl.JmsMessageReader._
import pekko.util.ByteString
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.OptionConverters._
/**
diff --git a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/impl/JmsMessageReader.scala b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/impl/JmsMessageReader.scala
index 30bbd0548..86012c3a4 100644
--- a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/impl/JmsMessageReader.scala
+++ b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/impl/JmsMessageReader.scala
@@ -20,7 +20,7 @@ import pekko.annotation.InternalApi
import pekko.stream.connectors.jms._
import pekko.util.ByteString
import scala.annotation.tailrec
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
@InternalApi
private[jms] object JmsMessageReader {
diff --git a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsConsumer.scala b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsConsumer.scala
index 1880838a0..235fb657a 100644
--- a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsConsumer.scala
+++ b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsConsumer.scala
@@ -19,7 +19,7 @@ import pekko.NotUsed
import pekko.stream.connectors.jms._
import pekko.stream.javadsl.Source
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Factory methods to create JMS consumers.
diff --git a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsProducer.scala b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsProducer.scala
index 844249eb0..2ddac67ca 100644
--- a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsProducer.scala
+++ b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/javadsl/JmsProducer.scala
@@ -22,7 +22,7 @@ import pekko.stream.scaladsl.{ Flow, Keep }
import pekko.util.ByteString
import pekko.{ Done, NotUsed }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters
/**
diff --git a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/scaladsl/JmsConsumer.scala b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/scaladsl/JmsConsumer.scala
index 8523b1e84..b01200a91 100644
--- a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/scaladsl/JmsConsumer.scala
+++ b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/scaladsl/JmsConsumer.scala
@@ -20,7 +20,7 @@ import pekko.stream.connectors.jms.impl._
import pekko.stream.scaladsl.Source
import javax.jms
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Factory methods to create JMS consumers.
diff --git a/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala b/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
index f73d26600..a5573c87f 100644
--- a/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
+++ b/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
@@ -34,7 +34,7 @@ import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
import scala.annotation.tailrec
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.collection.mutable
import scala.concurrent.Future
diff --git a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/KinesisSourceStage.scala b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/KinesisSourceStage.scala
index 468db8dba..cabd7f3b0 100644
--- a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/KinesisSourceStage.scala
+++ b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/KinesisSourceStage.scala
@@ -25,7 +25,7 @@ import software.amazon.awssdk.services.kinesis.KinesisAsyncClient
import software.amazon.awssdk.services.kinesis.model._
import scala.collection.mutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.util.{ Failure, Success, Try }
import scala.compat.java8.FutureConverters._
diff --git a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/ShardProcessor.scala b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/ShardProcessor.scala
index 0e773bb61..8eb4b7a51 100644
--- a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/ShardProcessor.scala
+++ b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/impl/ShardProcessor.scala
@@ -24,7 +24,7 @@ import software.amazon.kinesis.lifecycle.events._
import software.amazon.kinesis.processor.{ RecordProcessorCheckpointer, ShardRecordProcessor }
import software.amazon.kinesis.retrieval.KinesisClientRecord
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
@InternalApi
private[kinesis] class ShardProcessor(
diff --git a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/javadsl/KinesisSource.scala b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/javadsl/KinesisSource.scala
index 18d02b1fd..ee42c2abb 100644
--- a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/javadsl/KinesisSource.scala
+++ b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/javadsl/KinesisSource.scala
@@ -20,7 +20,7 @@ import pekko.stream.javadsl.Source
import software.amazon.awssdk.services.kinesis.KinesisAsyncClient
import software.amazon.awssdk.services.kinesis.model.Record
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object KinesisSource {
diff --git a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/scaladsl/KinesisFlow.scala b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/scaladsl/KinesisFlow.scala
index 5ecce94f1..881192d7a 100644
--- a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/scaladsl/KinesisFlow.scala
+++ b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesis/scaladsl/KinesisFlow.scala
@@ -32,7 +32,7 @@ import software.amazon.awssdk.services.kinesis.model.{
PutRecordsResultEntry
}
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Queue
import scala.concurrent.duration._
import scala.compat.java8.FutureConverters._
diff --git a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala
index 670d2a28f..06f9e5b91 100644
--- a/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala
+++ b/kinesis/src/main/scala/org/apache/pekko/stream/connectors/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala
@@ -23,7 +23,7 @@ import pekko.stream.scaladsl.Flow
import software.amazon.awssdk.services.firehose.FirehoseAsyncClient
import software.amazon.awssdk.services.firehose.model.{ PutRecordBatchRequest, PutRecordBatchResponseEntry, Record }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Queue
import scala.concurrent.duration._
diff --git a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisFlowSpec.scala b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisFlowSpec.scala
index 040fca4b7..024337f68 100644
--- a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisFlowSpec.scala
+++ b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisFlowSpec.scala
@@ -32,7 +32,7 @@ import org.scalatest.matchers.should.Matchers
import software.amazon.awssdk.core.SdkBytes
import software.amazon.awssdk.services.kinesis.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class KinesisFlowSpec extends AnyWordSpec with Matchers with KinesisMock with LogCapturing {
diff --git a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisSchedulerSourceSpec.scala b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisSchedulerSourceSpec.scala
index 9c2938f30..87ffe05db 100644
--- a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisSchedulerSourceSpec.scala
+++ b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesis/KinesisSchedulerSourceSpec.scala
@@ -47,7 +47,7 @@ import software.amazon.kinesis.processor.{
import software.amazon.kinesis.retrieval.KinesisClientRecord
import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.util.Random
diff --git a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesisfirehose/KinesisFirehoseFlowSpec.scala b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesisfirehose/KinesisFirehoseFlowSpec.scala
index 9c0fdddad..918e6ffba 100644
--- a/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesisfirehose/KinesisFirehoseFlowSpec.scala
+++ b/kinesis/src/test/scala/org/apache/pekko/stream/connectors/kinesisfirehose/KinesisFirehoseFlowSpec.scala
@@ -32,7 +32,7 @@ import org.scalatest.matchers.should.Matchers
import software.amazon.awssdk.core.SdkBytes
import software.amazon.awssdk.services.firehose.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class KinesisFirehoseFlowSpec extends AnyWordSpec with Matchers with KinesisFirehoseMock with LogCapturing {
diff --git a/kudu/src/main/scala/org/apache/pekko/stream/connectors/kudu/impl/KuduFlowStage.scala b/kudu/src/main/scala/org/apache/pekko/stream/connectors/kudu/impl/KuduFlowStage.scala
index fed6b2423..95a24db8f 100644
--- a/kudu/src/main/scala/org/apache/pekko/stream/connectors/kudu/impl/KuduFlowStage.scala
+++ b/kudu/src/main/scala/org/apache/pekko/stream/connectors/kudu/impl/KuduFlowStage.scala
@@ -22,7 +22,7 @@ import org.apache.kudu.Schema
import org.apache.kudu.Type._
import org.apache.kudu.client.{ KuduClient, KuduTable, PartialRow }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.util.control.NonFatal
/**
diff --git a/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala b/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala
index f2992829b..995d9dd8b 100644
--- a/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala
+++ b/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala
@@ -26,7 +26,7 @@ import org.apache.kudu.{ ColumnSchema, Schema, Type }
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.BeforeAndAfterAll
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.Future
import scala.concurrent.duration._
import org.scalatest.matchers.should.Matchers
diff --git a/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/javadsl/MongoFlow.scala b/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/javadsl/MongoFlow.scala
index 8991ba01f..ef2238f23 100644
--- a/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/javadsl/MongoFlow.scala
+++ b/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/javadsl/MongoFlow.scala
@@ -29,7 +29,7 @@ import com.mongodb.client.result.{ DeleteResult, UpdateResult }
import com.mongodb.reactivestreams.client.MongoCollection
import org.bson.conversions.Bson
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object MongoFlow {
diff --git a/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/scaladsl/MongoFlow.scala b/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/scaladsl/MongoFlow.scala
index 794c0ecc4..a4260d65f 100644
--- a/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/scaladsl/MongoFlow.scala
+++ b/mongodb/src/main/scala/org/apache/pekko/stream/connectors/mongodb/scaladsl/MongoFlow.scala
@@ -23,7 +23,7 @@ import com.mongodb.client.result.{ DeleteResult, UpdateResult }
import com.mongodb.reactivestreams.client.MongoCollection
import org.bson.conversions.Bson
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object MongoFlow {
diff --git a/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala b/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala
index bba001d73..fb74ef3a5 100644
--- a/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala
+++ b/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala
@@ -29,7 +29,7 @@ import org.mongodb.scala.bson.codecs.Macros._
import org.scalatest._
import org.scalatest.concurrent.ScalaFutures
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.duration._
import org.scalatest.matchers.must.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala b/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala
index 34b3c5ffd..9f10b6858 100644
--- a/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala
+++ b/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala
@@ -25,7 +25,7 @@ import org.bson.Document
import org.scalatest._
import org.scalatest.concurrent.ScalaFutures
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable.Seq
import scala.concurrent._
import scala.concurrent.duration._
diff --git a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala
index f7de32ecf..b63bc3107 100644
--- a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala
+++ b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala
@@ -27,7 +27,7 @@ import pekko.util.{ ByteIterator, ByteString, ByteStringBuilder }
import scala.annotation.tailrec
import scala.concurrent.duration._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.OptionConverters._
import scala.concurrent.{ ExecutionContext, Promise }
diff --git a/mqtt/src/main/scala/org/apache/pekko/stream/connectors/mqtt/settings.scala b/mqtt/src/main/scala/org/apache/pekko/stream/connectors/mqtt/settings.scala
index f83bdee02..c86517314 100644
--- a/mqtt/src/main/scala/org/apache/pekko/stream/connectors/mqtt/settings.scala
+++ b/mqtt/src/main/scala/org/apache/pekko/stream/connectors/mqtt/settings.scala
@@ -17,7 +17,7 @@ import org.apache.pekko
import pekko.util.JavaDurationConverters._
import org.eclipse.paho.client.mqttv3.{ MqttClientPersistence, MqttConnectOptions }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.collection.immutable.Map
import scala.concurrent.duration.{ FiniteDuration, _ }
diff --git a/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/impl/OrientDbSourceStage.scala b/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/impl/OrientDbSourceStage.scala
index 3a5d5c7e8..e4b079789 100644
--- a/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/impl/OrientDbSourceStage.scala
+++ b/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/impl/OrientDbSourceStage.scala
@@ -24,7 +24,7 @@ import com.orientechnologies.orient.`object`.db.OObjectDatabaseTx
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx
import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* INTERNAL API
diff --git a/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/javadsl/OrientDbFlow.scala b/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/javadsl/OrientDbFlow.scala
index 6ec7df7e5..c6f25e4fd 100644
--- a/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/javadsl/OrientDbFlow.scala
+++ b/orientdb/src/main/scala/org/apache/pekko/stream/connectors/orientdb/javadsl/OrientDbFlow.scala
@@ -19,7 +19,7 @@ import pekko.stream.connectors.orientdb._
import pekko.stream.javadsl.Flow
import com.orientechnologies.orient.core.record.impl.ODocument
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Java API.
diff --git a/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/model.scala b/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/model.scala
index 70955bed4..b87ead520 100644
--- a/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/model.scala
+++ b/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/model.scala
@@ -20,7 +20,7 @@ import pekko.annotation.InternalApi
import pekko.util.ByteString
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.OptionConverters._
import scala.util.{ Success, Try }
diff --git a/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/testkit/MessageFactory.scala b/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/testkit/MessageFactory.scala
index 161fca9c4..333ec688a 100644
--- a/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/testkit/MessageFactory.scala
+++ b/reference/src/main/scala/org/apache/pekko/stream/connectors/reference/testkit/MessageFactory.scala
@@ -19,7 +19,7 @@ import pekko.stream.connectors.reference.{ ReferenceReadResult, ReferenceWriteMe
import pekko.util.ByteString
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.util.{ Failure, Success, Try }
@ApiMayChange
diff --git a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3ExtSpec.scala b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3ExtSpec.scala
index 37ef073ec..548f35117 100644
--- a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3ExtSpec.scala
+++ b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3ExtSpec.scala
@@ -21,7 +21,7 @@ import com.typesafe.config.ConfigFactory
import org.scalatest.flatspec.AnyFlatSpecLike
import org.scalatest.matchers.should.Matchers
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
class S3ExtSpec extends AnyFlatSpecLike with Matchers {
it should "reuse application config from actor system" in {
diff --git a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3IntegrationSpec.scala b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3IntegrationSpec.scala
index 5abc23ba7..ba8506c8c 100644
--- a/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3IntegrationSpec.scala
+++ b/s3/src/test/scala/org/apache/pekko/stream/connectors/s3/scaladsl/S3IntegrationSpec.scala
@@ -40,7 +40,7 @@ import scala.annotation.tailrec
import scala.collection.immutable
import scala.concurrent.duration._
import scala.concurrent.{ Await, ExecutionContext, Future }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
trait S3IntegrationSpec
extends AnyFlatSpecLike
diff --git a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/SolrMessages.scala b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/SolrMessages.scala
index 3760876bb..0f9b7ce57 100644
--- a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/SolrMessages.scala
+++ b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/SolrMessages.scala
@@ -17,7 +17,7 @@ import org.apache.pekko
import pekko.NotUsed
import pekko.annotation.InternalApi
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object WriteMessage {
def createUpsertMessage[T](source: T): WriteMessage[T, NotUsed] =
diff --git a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala
index c418e1ac0..993fa5221 100644
--- a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala
+++ b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/impl/SolrFlowStage.scala
@@ -29,7 +29,7 @@ import scala.annotation.tailrec
import scala.util.control.NonFatal
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Internal API
diff --git a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/javadsl/SolrFlow.scala b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/javadsl/SolrFlow.scala
index 3d951ac5c..e0f0f0456 100644
--- a/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/javadsl/SolrFlow.scala
+++ b/solr/src/main/scala/org/apache/pekko/stream/connectors/solr/javadsl/SolrFlow.scala
@@ -23,7 +23,7 @@ import pekko.stream.scaladsl.Flow
import org.apache.solr.client.solrj.SolrClient
import org.apache.solr.common.SolrInputDocument
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
/**
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/SqsSourceSettings.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/SqsSourceSettings.scala
index a18c80cca..d17bd0ec8 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/SqsSourceSettings.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/SqsSourceSettings.scala
@@ -18,7 +18,7 @@ import java.time.temporal.ChronoUnit
import software.amazon.awssdk.services.sqs.model
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.duration.FiniteDuration
final class SqsSourceSettings private (
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishFlow.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishFlow.scala
index e5e37eb15..ab18981ba 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishFlow.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishFlow.scala
@@ -28,7 +28,7 @@ import pekko.stream.scaladsl.{ Flow => SFlow }
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model.SendMessageRequest
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
/**
* Java API to create SQS flows.
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishSink.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishSink.scala
index 651a757f9..2ae8a3f30 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishSink.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/javadsl/SqsPublishSink.scala
@@ -23,7 +23,7 @@ import pekko.stream.scaladsl.{ Flow, Keep }
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model.SendMessageRequest
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters.FutureOps
/**
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsAckFlow.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsAckFlow.scala
index dc1a182dd..3411db871 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsAckFlow.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsAckFlow.scala
@@ -28,7 +28,7 @@ import pekko.stream.scaladsl.{ Flow, GraphDSL, Merge, Partition }
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.compat.java8.FutureConverters._
import scala.concurrent.Future
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsPublishFlow.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsPublishFlow.scala
index 17ef9e059..bd2b60ec8 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsPublishFlow.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsPublishFlow.scala
@@ -24,7 +24,7 @@ import pekko.stream.scaladsl.{ Flow, Source }
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters._
/**
diff --git a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsSource.scala b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsSource.scala
index 5954298e5..773461fe8 100644
--- a/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsSource.scala
+++ b/sqs/src/main/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/SqsSource.scala
@@ -22,7 +22,7 @@ import pekko.stream.scaladsl.{ Flow, Source }
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.FutureConverters._
/**
diff --git a/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala
index 2c3e14ea7..8ce0979aa 100644
--- a/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala
+++ b/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala
@@ -32,7 +32,7 @@ import org.scalatestplus.mockito.MockitoSugar.mock
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model._
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.duration._
class SqsAckSpec extends AnyFlatSpec with Matchers with DefaultTestContext with LogCapturing {
diff --git a/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala
index 9910b0ac7..2b1e5bf49 100644
--- a/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala
+++ b/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala
@@ -26,7 +26,7 @@ import org.scalatest.matchers.should.Matchers
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model.{ Message, ReceiveMessageRequest, SendMessageRequest }
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.duration._
class SqsPublishSpec extends AnyFlatSpec with Matchers with DefaultTestContext with LogCapturing {
diff --git a/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala
index d45549531..bfd2bbb36 100644
--- a/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala
+++ b/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala
@@ -39,7 +39,7 @@ import software.amazon.awssdk.services.sqs.model.{
SendMessageRequest
}
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.collection.immutable
import scala.concurrent.Future
import scala.concurrent.duration._
diff --git a/sqs/src/test/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/DefaultTestContext.scala b/sqs/src/test/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/DefaultTestContext.scala
index 20a1206f1..62fc54b5d 100644
--- a/sqs/src/test/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/DefaultTestContext.scala
+++ b/sqs/src/test/scala/org/apache/pekko/stream/connectors/sqs/scaladsl/DefaultTestContext.scala
@@ -32,7 +32,7 @@ import software.amazon.awssdk.regions.Region
import software.amazon.awssdk.services.sqs.SqsAsyncClient
import software.amazon.awssdk.services.sqs.model.CreateQueueRequest
//#init-client
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.concurrent.duration._
import scala.util.Random
diff --git a/testkit/src/main/scala/org/apache/pekko/stream/connectors/testkit/CapturingAppender.scala b/testkit/src/main/scala/org/apache/pekko/stream/connectors/testkit/CapturingAppender.scala
index b9d7abaa9..b9a1df047 100644
--- a/testkit/src/main/scala/org/apache/pekko/stream/connectors/testkit/CapturingAppender.scala
+++ b/testkit/src/main/scala/org/apache/pekko/stream/connectors/testkit/CapturingAppender.scala
@@ -99,7 +99,7 @@ import org.slf4j.LoggerFactory
* Also clears the buffer..
*/
def flush(sourceActorSystem: Option[String]): Unit = synchronized {
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val logbackLogger = getLogbackLogger(classOf[CapturingAppender].getName + "Delegate")
val appenders = logbackLogger.iteratorForAppenders().asScala.filterNot(_ == this).toList
for (event <- buffer; appender <- appenders) {
diff --git a/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala b/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala
index 4edde75c4..61091b770 100644
--- a/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala
+++ b/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala
@@ -53,7 +53,7 @@ class CharsetCodingFlowsDoc
import pekko.stream.scaladsl.FileIO
// #encoding
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val targetFile = Paths.get("target/outdata.txt")
val strings = System.getProperties.asScala.map(p => p._1 + " -> " + p._2).toList
// #encoding
diff --git a/text/src/test/scala/org/apache/pekko/stream/connectors/text/scaladsl/CharsetCodingFlowsSpec.scala b/text/src/test/scala/org/apache/pekko/stream/connectors/text/scaladsl/CharsetCodingFlowsSpec.scala
index 22d0a7d6b..d028ce6d0 100644
--- a/text/src/test/scala/org/apache/pekko/stream/connectors/text/scaladsl/CharsetCodingFlowsSpec.scala
+++ b/text/src/test/scala/org/apache/pekko/stream/connectors/text/scaladsl/CharsetCodingFlowsSpec.scala
@@ -75,7 +75,7 @@ class CharsetCodingFlowsSpec
import pekko.stream.scaladsl.FileIO
// #encoding
- import scala.collection.JavaConverters._
+ import org.apache.pekko.util.ccompat.JavaConverters._
val targetFile = Paths.get("target/outdata.txt")
val strings = System.getProperties.asScala.map(p => p._1 + " -> " + p._2).toList
val stringSource: Source[String, _] = Source(strings)
diff --git a/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/javadsl/XmlParsing.scala b/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/javadsl/XmlParsing.scala
index 23f6c3d62..bb425b878 100644
--- a/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/javadsl/XmlParsing.scala
+++ b/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/javadsl/XmlParsing.scala
@@ -23,7 +23,7 @@ import org.w3c.dom.Element
import java.util.function.Consumer
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
object XmlParsing {
diff --git a/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/model.scala b/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/model.scala
index 8b713f5c5..61cc37b95 100644
--- a/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/model.scala
+++ b/xml/src/main/scala/org/apache/pekko/stream/connectors/xml/model.scala
@@ -15,7 +15,7 @@ package org.apache.pekko.stream.connectors.xml
import java.util.Optional
-import scala.collection.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
import scala.compat.java8.OptionConverters._
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org