You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/06/23 08:29:17 UTC

[incubator-pekko-connectors-kafka] branch main updated: use LEGAL-626 approved ASF header (#90)

This is an automated email from the ASF dual-hosted git repository.

fanningpj 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 0a55b158 use LEGAL-626 approved ASF header (#90)
0a55b158 is described below

commit 0a55b158d2d7fd8c050ab147d80d259a79e3ffe2
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Fri Jun 23 09:29:10 2023 +0100

    use LEGAL-626 approved ASF header (#90)
---
 .../org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala  |  2 +-
 .../apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala  |  2 +-
 .../kafka/benchmarks/PekkoConnectorsCommittableProducer.scala |  2 +-
 .../it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala |  2 +-
 .../it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala |  2 +-
 .../org/apache/pekko/kafka/benchmarks/Transactions.scala      |  2 +-
 .../org/apache/pekko/kafka/benchmarks/CsvFormatter.scala      |  2 +-
 .../scala/org/apache/pekko/kafka/benchmarks/FixtureGen.scala  |  2 +-
 .../org/apache/pekko/kafka/benchmarks/InflightMetrics.scala   |  2 +-
 .../pekko/kafka/benchmarks/KafkaConsumerBenchmarks.scala      |  2 +-
 .../pekko/kafka/benchmarks/KafkaConsumerFixtureGen.scala      |  2 +-
 .../pekko/kafka/benchmarks/KafkaProducerBenchmarks.scala      |  2 +-
 .../pekko/kafka/benchmarks/KafkaProducerFixtureGen.scala      |  2 +-
 .../pekko/kafka/benchmarks/KafkaTransactionBenchmarks.scala   |  2 +-
 .../pekko/kafka/benchmarks/KafkaTransactionFixtureGen.scala   |  2 +-
 .../benchmarks/PekkoConnectorsCommittableSinkFixtures.scala   |  2 +-
 .../apache/pekko/kafka/benchmarks/PerfFixtureHelpers.scala    |  2 +-
 .../kafka/benchmarks/ReactiveKafkaConsumerBenchmarks.scala    |  2 +-
 .../kafka/benchmarks/ReactiveKafkaConsumerFixtures.scala      |  2 +-
 .../kafka/benchmarks/ReactiveKafkaProducerBenchmarks.scala    |  2 +-
 .../kafka/benchmarks/ReactiveKafkaProducerFixtures.scala      |  2 +-
 .../kafka/benchmarks/ReactiveKafkaTransactionBenchmarks.scala |  2 +-
 .../kafka/benchmarks/ReactiveKafkaTransactionFixtures.scala   |  2 +-
 .../main/scala/org/apache/pekko/kafka/benchmarks/Timed.scala  |  2 +-
 .../apache/pekko/kafka/benchmarks/app/RunTestCommand.scala    |  2 +-
 build.sbt                                                     |  9 +++++++++
 .../pekko/kafka/cluster/sharding/KafkaClusterSharding.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/CommitTimeoutException.scala |  2 +-
 .../main/scala/org/apache/pekko/kafka/CommitterSettings.scala |  2 +-
 .../org/apache/pekko/kafka/ConnectionCheckerSettings.scala    |  2 +-
 .../main/scala/org/apache/pekko/kafka/ConsumerFailed.scala    |  2 +-
 .../main/scala/org/apache/pekko/kafka/ConsumerMessage.scala   |  2 +-
 .../main/scala/org/apache/pekko/kafka/ConsumerSettings.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/KafkaConnectionFailed.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/KafkaConsumerActor.scala     |  2 +-
 core/src/main/scala/org/apache/pekko/kafka/Metadata.scala     |  2 +-
 .../apache/pekko/kafka/OffsetResetProtectionSettings.scala    |  2 +-
 .../main/scala/org/apache/pekko/kafka/ProducerMessage.scala   |  2 +-
 .../main/scala/org/apache/pekko/kafka/ProducerSettings.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/RestrictedConsumer.scala     |  2 +-
 .../src/main/scala/org/apache/pekko/kafka/Subscriptions.scala |  2 +-
 .../apache/pekko/kafka/internal/BaseSingleSourceLogic.scala   |  2 +-
 .../apache/pekko/kafka/internal/CommitCollectorStage.scala    |  2 +-
 .../apache/pekko/kafka/internal/CommitObservationLogic.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/internal/CommitTrigger.scala |  2 +-
 .../org/apache/pekko/kafka/internal/CommittableSources.scala  |  2 +-
 .../pekko/kafka/internal/CommittingProducerSinkStage.scala    |  2 +-
 .../org/apache/pekko/kafka/internal/ConfigSettings.scala      |  2 +-
 .../org/apache/pekko/kafka/internal/ConnectionChecker.scala   |  2 +-
 .../pekko/kafka/internal/ConsumerProgressTracking.scala       |  2 +-
 .../apache/pekko/kafka/internal/ConsumerResetProtection.scala |  2 +-
 .../apache/pekko/kafka/internal/ControlImplementations.scala  |  2 +-
 .../apache/pekko/kafka/internal/DefaultProducerStage.scala    |  2 +-
 .../org/apache/pekko/kafka/internal/DeferredProducer.scala    |  2 +-
 .../pekko/kafka/internal/ExternalSingleSourceLogic.scala      |  2 +-
 .../org/apache/pekko/kafka/internal/KafkaConsumerActor.scala  |  2 +-
 .../org/apache/pekko/kafka/internal/KafkaSourceStage.scala    |  2 +-
 .../scala/org/apache/pekko/kafka/internal/LoggingWithId.scala |  2 +-
 .../org/apache/pekko/kafka/internal/MessageBuilder.scala      |  2 +-
 .../pekko/kafka/internal/PartitionAssignmentHelpers.scala     |  2 +-
 .../scala/org/apache/pekko/kafka/internal/PlainSources.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/internal/ProducerStage.scala |  2 +-
 .../org/apache/pekko/kafka/internal/SingleSourceLogic.scala   |  2 +-
 .../org/apache/pekko/kafka/internal/SourceLogicBuffer.scala   |  2 +-
 .../apache/pekko/kafka/internal/SourceLogicSubscription.scala |  2 +-
 .../org/apache/pekko/kafka/internal/SubSourceLogic.scala      |  2 +-
 .../pekko/kafka/internal/TransactionalProducerStage.scala     |  2 +-
 .../apache/pekko/kafka/internal/TransactionalSources.scala    |  2 +-
 .../main/scala/org/apache/pekko/kafka/javadsl/Committer.scala |  2 +-
 .../main/scala/org/apache/pekko/kafka/javadsl/Consumer.scala  |  2 +-
 .../org/apache/pekko/kafka/javadsl/DiscoverySupport.scala     |  2 +-
 .../scala/org/apache/pekko/kafka/javadsl/MetadataClient.scala |  2 +-
 .../pekko/kafka/javadsl/PartitionAssignmentHandler.scala      |  2 +-
 .../main/scala/org/apache/pekko/kafka/javadsl/Producer.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/javadsl/SendProducer.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/javadsl/Transactional.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/Committer.scala     |  2 +-
 .../main/scala/org/apache/pekko/kafka/scaladsl/Consumer.scala |  2 +-
 .../org/apache/pekko/kafka/scaladsl/DiscoverySupport.scala    |  2 +-
 .../org/apache/pekko/kafka/scaladsl/MetadataClient.scala      |  2 +-
 .../pekko/kafka/scaladsl/PartitionAssignmentHandler.scala     |  2 +-
 .../main/scala/org/apache/pekko/kafka/scaladsl/Producer.scala |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/SendProducer.scala  |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/Transactional.scala |  2 +-
 java-tests/src/test/java/docs/javadsl/AssignmentTest.java     |  2 +-
 java-tests/src/test/java/docs/javadsl/AtLeastOnceTest.java    |  2 +-
 .../src/test/java/docs/javadsl/ClusterShardingExample.java    |  2 +-
 .../src/test/java/docs/javadsl/ConsumerExampleTest.java       |  2 +-
 .../src/test/java/docs/javadsl/ConsumerSettingsTest.java      |  2 +-
 java-tests/src/test/java/docs/javadsl/FetchMetadataTest.java  |  2 +-
 java-tests/src/test/java/docs/javadsl/MetadataClientTest.java |  2 +-
 .../src/test/java/docs/javadsl/ProducerSettingsTest.java      |  2 +-
 java-tests/src/test/java/docs/javadsl/ProducerTest.java       |  2 +-
 java-tests/src/test/java/docs/javadsl/SampleData.java         |  2 +-
 .../java/docs/javadsl/SchemaRegistrySerializationTest.java    |  2 +-
 java-tests/src/test/java/docs/javadsl/SendProducerTest.java   |  2 +-
 java-tests/src/test/java/docs/javadsl/SerializationTest.java  |  2 +-
 java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java |  2 +-
 .../src/test/java/docs/javadsl/TestkitTestcontainersTest.java |  2 +-
 .../src/test/java/docs/javadsl/TransactionsExampleTest.java   |  2 +-
 .../src/test/java/docs/javadsl/proto/OrderMessages.java       |  2 +-
 .../pekko/kafka/tests/javadsl/LogCapturingExtension.scala     |  2 +-
 .../apache/pekko/kafka/tests/javadsl/LogCapturingJunit4.scala |  2 +-
 project/AutomaticModuleName.scala                             |  2 +-
 project/CopyrightHeader.scala                                 |  4 ++--
 project/CopyrightHeaderForBuild.scala                         |  6 ++++--
 project/CopyrightHeaderForProtobuf.scala                      |  2 +-
 project/Dependencies.scala                                    |  2 +-
 project/PackagingTypePlugin.scala                             |  2 +-
 project/ParadoxSettings.scala                                 |  2 +-
 project/ProjectSettings.scala                                 |  2 +-
 project/ResolverSettings.scala                                |  2 +-
 project/VersionGenerator.scala                                |  2 +-
 project/Versions.scala                                        |  2 +-
 project/plugins.sbt                                           | 11 ++++++++++-
 .../main/java/org/apache/pekko/kafka/testkit/KafkaTest.java   |  2 +-
 .../pekko/kafka/testkit/TestcontainersKafkaJunit4Test.java    |  2 +-
 .../apache/pekko/kafka/testkit/TestcontainersKafkaTest.java   |  2 +-
 .../pekko/kafka/testkit/internal/KafkaContainerCluster.java   |  2 +-
 .../kafka/testkit/internal/PekkoConnectorsKafkaContainer.java |  2 +-
 .../pekko/kafka/testkit/internal/SchemaRegistryContainer.java |  2 +-
 .../org/apache/pekko/kafka/testkit/javadsl/BaseKafkaTest.java |  2 +-
 .../apache/pekko/kafka/testkit/javadsl/KafkaJunit4Test.java   |  2 +-
 .../apache/pekko/kafka/testkit/ConsumerResultFactory.scala    |  2 +-
 .../org/apache/pekko/kafka/testkit/KafkaTestkitSettings.scala |  2 +-
 .../kafka/testkit/KafkaTestkitTestcontainersSettings.scala    |  2 +-
 .../apache/pekko/kafka/testkit/ProducerResultFactory.scala    |  2 +-
 .../apache/pekko/kafka/testkit/internal/KafkaTestKit.scala    |  2 +-
 .../pekko/kafka/testkit/internal/KafkaTestKitChecks.scala     |  2 +-
 .../pekko/kafka/testkit/internal/TestFrameworkInterface.scala |  2 +-
 .../pekko/kafka/testkit/internal/TestcontainersKafka.scala    |  2 +-
 .../pekko/kafka/testkit/javadsl/ConsumerControlFactory.scala  |  2 +-
 .../pekko/kafka/testkit/scaladsl/ConsumerControlFactory.scala |  2 +-
 .../org/apache/pekko/kafka/testkit/scaladsl/KafkaSpec.scala   |  2 +-
 .../pekko/kafka/testkit/scaladsl/ScalatestKafkaSpec.scala     |  2 +-
 .../kafka/testkit/scaladsl/TestcontainersKafkaLike.scala      |  2 +-
 .../testkit/scaladsl/TestcontainersKafkaPerClassLike.scala    |  2 +-
 .../it/scala/org/apache/pekko/kafka/IntegrationTests.scala    |  2 +-
 .../apache/pekko/kafka/PartitionedSourceFailoverSpec.scala    |  2 +-
 .../org/apache/pekko/kafka/PlainSourceFailoverSpec.scala      |  2 +-
 .../pekko/kafka/TransactionsPartitionedSourceSpec.scala       |  2 +-
 .../scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala |  2 +-
 tests/src/main/proto/order.proto                              |  2 +-
 tests/src/main/scala/org/apache/pekko/kafka/KafkaPorts.scala  |  2 +-
 tests/src/test/scala/docs/scaladsl/AssignmentSpec.scala       |  2 +-
 tests/src/test/scala/docs/scaladsl/AtLeastOnce.scala          |  2 +-
 .../src/test/scala/docs/scaladsl/ClusterShardingExample.scala |  2 +-
 tests/src/test/scala/docs/scaladsl/ConsumerExample.scala      |  2 +-
 tests/src/test/scala/docs/scaladsl/DocsSpecBase.scala         |  2 +-
 tests/src/test/scala/docs/scaladsl/FetchMetadata.scala        |  2 +-
 tests/src/test/scala/docs/scaladsl/PartitionExamples.scala    |  2 +-
 tests/src/test/scala/docs/scaladsl/ProducerExample.scala      |  2 +-
 .../scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala |  2 +-
 tests/src/test/scala/docs/scaladsl/SendProducerSpec.scala     |  2 +-
 tests/src/test/scala/docs/scaladsl/SerializationSpec.scala    |  2 +-
 tests/src/test/scala/docs/scaladsl/TestkitSamplesSpec.scala   |  2 +-
 tests/src/test/scala/docs/scaladsl/TransactionsExample.scala  |  2 +-
 tests/src/test/scala/docs/scaladsl/proto/Order.scala          |  2 +-
 tests/src/test/scala/docs/scaladsl/proto/OrderProto.scala     |  2 +-
 .../scala/org/apache/pekko/kafka/ConfigSettingsSpec.scala     |  2 +-
 .../scala/org/apache/pekko/kafka/ConsumerSettingsSpec.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/ProducerSettingsSpec.scala   |  2 +-
 tests/src/test/scala/org/apache/pekko/kafka/Repeated.scala    |  2 +-
 .../test/scala/org/apache/pekko/kafka/TransactionsOps.scala   |  2 +-
 .../pekko/kafka/internal/CommitCollectorStageSpec.scala       |  2 +-
 .../pekko/kafka/internal/CommittingProducerSinkSpec.scala     |  2 +-
 .../apache/pekko/kafka/internal/CommittingWithMockSpec.scala  |  2 +-
 .../apache/pekko/kafka/internal/ConnectionCheckerSpec.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/internal/ConsumerDummy.scala |  2 +-
 .../scala/org/apache/pekko/kafka/internal/ConsumerMock.scala  |  2 +-
 .../pekko/kafka/internal/ConsumerProgressTrackingSpec.scala   |  2 +-
 .../pekko/kafka/internal/ConsumerResetProtectionSpec.scala    |  2 +-
 .../scala/org/apache/pekko/kafka/internal/ConsumerSpec.scala  |  2 +-
 .../org/apache/pekko/kafka/internal/EnhancedConfigSpec.scala  |  2 +-
 .../apache/pekko/kafka/internal/OffsetAggregationSpec.scala   |  2 +-
 .../apache/pekko/kafka/internal/PartitionedSourceSpec.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/internal/ProducerSpec.scala  |  2 +-
 .../org/apache/pekko/kafka/internal/SubscriptionsSpec.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/javadsl/ControlSpec.scala    |  2 +-
 .../org/apache/pekko/kafka/scaladsl/CommittableSinkSpec.scala |  2 +-
 .../org/apache/pekko/kafka/scaladsl/CommittingSpec.scala      |  2 +-
 .../apache/pekko/kafka/scaladsl/ConnectionCheckerSpec.scala   |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/ControlSpec.scala   |  2 +-
 .../org/apache/pekko/kafka/scaladsl/IntegrationSpec.scala     |  2 +-
 .../org/apache/pekko/kafka/scaladsl/MetadataClientSpec.scala  |  2 +-
 .../pekko/kafka/scaladsl/MisconfiguredConsumerSpec.scala      |  2 +-
 .../pekko/kafka/scaladsl/MisconfiguredProducerSpec.scala      |  2 +-
 .../org/apache/pekko/kafka/scaladsl/MultiConsumerSpec.scala   |  2 +-
 .../apache/pekko/kafka/scaladsl/PartitionedSourcesSpec.scala  |  2 +-
 .../org/apache/pekko/kafka/scaladsl/RebalanceExtSpec.scala    |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/RebalanceSpec.scala |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/ReconnectSpec.scala |  2 +-
 .../org/apache/pekko/kafka/scaladsl/RetentionPeriodSpec.scala |  2 +-
 .../test/scala/org/apache/pekko/kafka/scaladsl/SpecBase.scala |  2 +-
 .../scala/org/apache/pekko/kafka/scaladsl/TimestampSpec.scala |  2 +-
 .../org/apache/pekko/kafka/scaladsl/TransactionsSpec.scala    |  2 +-
 .../org/apache/pekko/kafka/tests/CapturingAppender.scala      |  2 +-
 .../test/scala/org/apache/pekko/kafka/tests/LogbackUtil.scala |  2 +-
 .../org/apache/pekko/kafka/tests/scaladsl/LogCapturing.scala  |  2 +-
 200 files changed, 221 insertions(+), 201 deletions(-)

diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
index db5f2379..2889d222 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/BatchedConsumer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
index 253a53e8..e9489e8c 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Benchmarks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
index d135c5f6..7ee182c8 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/NoCommitBackpressure.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
index 7051f09c..8e64ecd6 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableProducer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
index 25600a52..74261962 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Producer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
index f5c773d9..29979cbe 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/SpecBase.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
index 33b1e3cc..e97db993 100644
--- a/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
+++ b/benchmarks/src/it/scala/org/apache/pekko/kafka/benchmarks/Transactions.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/CsvFormatter.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/CsvFormatter.scala
index 6815f40d..cd959083 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/CsvFormatter.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/CsvFormatter.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/FixtureGen.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/FixtureGen.scala
index ea394c8c..efde79e9 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/FixtureGen.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/FixtureGen.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 588007e5..69a69462 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 116a5d0b..3246c973 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 c0829140..a5e7646d 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerBenchmarks.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerBenchmarks.scala
index fbcbdc53..1b484c4d 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerBenchmarks.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerBenchmarks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerFixtureGen.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerFixtureGen.scala
index c83152c3..8814ec16 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerFixtureGen.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/KafkaProducerFixtureGen.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 fd7f18fa..f94da98f 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 3ec351a0..ead493f0 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableSinkFixtures.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableSinkFixtures.scala
index 4f1b8db3..46074109 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableSinkFixtures.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PekkoConnectorsCommittableSinkFixtures.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PerfFixtureHelpers.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PerfFixtureHelpers.scala
index 5a396b0f..5a96782f 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PerfFixtureHelpers.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/PerfFixtureHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerBenchmarks.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerBenchmarks.scala
index 88350a58..be66980a 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerBenchmarks.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerBenchmarks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerFixtures.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerFixtures.scala
index 2e047640..aaef4b4e 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerFixtures.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaConsumerFixtures.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerBenchmarks.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerBenchmarks.scala
index c9e8fcfd..b622e62d 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerBenchmarks.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerBenchmarks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerFixtures.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerFixtures.scala
index 85d2e3f9..319a1e9d 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerFixtures.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaProducerFixtures.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionBenchmarks.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionBenchmarks.scala
index 8564bf08..55ec86f2 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionBenchmarks.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionBenchmarks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionFixtures.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionFixtures.scala
index 0f6f7274..4b5be6b6 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionFixtures.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/ReactiveKafkaTransactionFixtures.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/Timed.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/Timed.scala
index 1a37ff12..bd470cd2 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/Timed.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/Timed.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/app/RunTestCommand.scala b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/app/RunTestCommand.scala
index 74214783..f339f126 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/app/RunTestCommand.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/kafka/benchmarks/app/RunTestCommand.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/build.sbt b/build.sbt
index 5d84db0a..7e3b7be1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
 import com.typesafe.tools.mima.core.{ Problem, ProblemFilters }
 import ProjectSettings.commonSettings
 
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/kafka/cluster/sharding/KafkaClusterSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/kafka/cluster/sharding/KafkaClusterSharding.scala
index 3a323218..18a22dea 100644
--- a/cluster-sharding/src/main/scala/org/apache/pekko/kafka/cluster/sharding/KafkaClusterSharding.scala
+++ b/cluster-sharding/src/main/scala/org/apache/pekko/kafka/cluster/sharding/KafkaClusterSharding.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/CommitTimeoutException.scala b/core/src/main/scala/org/apache/pekko/kafka/CommitTimeoutException.scala
index 03084eee..422ffb43 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/CommitTimeoutException.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/CommitTimeoutException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/CommitterSettings.scala b/core/src/main/scala/org/apache/pekko/kafka/CommitterSettings.scala
index 7a5dfd71..f45a3268 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/CommitterSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/CommitterSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ConnectionCheckerSettings.scala b/core/src/main/scala/org/apache/pekko/kafka/ConnectionCheckerSettings.scala
index b19ab5ec..acd93392 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConnectionCheckerSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConnectionCheckerSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/ConsumerFailed.scala b/core/src/main/scala/org/apache/pekko/kafka/ConsumerFailed.scala
index 7312fdc0..6a04cc3f 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConsumerFailed.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConsumerFailed.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 ae617d5a..3b66271a 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConsumerMessage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 8cc948a6..0efdf4a7 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ConsumerSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/KafkaConnectionFailed.scala b/core/src/main/scala/org/apache/pekko/kafka/KafkaConnectionFailed.scala
index 80f69b6a..f780f21d 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/KafkaConnectionFailed.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/KafkaConnectionFailed.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/KafkaConsumerActor.scala b/core/src/main/scala/org/apache/pekko/kafka/KafkaConsumerActor.scala
index 457a5465..ccb992f1 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/KafkaConsumerActor.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/KafkaConsumerActor.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 c3c1b196..6ac0ac15 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/Metadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/OffsetResetProtectionSettings.scala b/core/src/main/scala/org/apache/pekko/kafka/OffsetResetProtectionSettings.scala
index d90f62f0..1e935145 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/OffsetResetProtectionSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/OffsetResetProtectionSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 c7c02bc8..53a1f3f9 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ProducerMessage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 2a1e8e94..b80c8579 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/ProducerSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/RestrictedConsumer.scala b/core/src/main/scala/org/apache/pekko/kafka/RestrictedConsumer.scala
index 00c6d8a9..3eb05f53 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/RestrictedConsumer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/RestrictedConsumer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 e7448acb..86697d18 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/Subscriptions.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/BaseSingleSourceLogic.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/BaseSingleSourceLogic.scala
index a5149052..c34c0136 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/BaseSingleSourceLogic.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/BaseSingleSourceLogic.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitCollectorStage.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitCollectorStage.scala
index 43a4cc18..5d471ea4 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitCollectorStage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitCollectorStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitObservationLogic.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitObservationLogic.scala
index d73e7ee8..e0293427 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitObservationLogic.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitObservationLogic.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitTrigger.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitTrigger.scala
index 0caa564c..6cd88477 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/CommitTrigger.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/CommitTrigger.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/CommittableSources.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/CommittableSources.scala
index 1dfeb93d..6d2a88cf 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/CommittableSources.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/CommittableSources.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkStage.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkStage.scala
index 80510139..78db2033 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkStage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/CommittingProducerSinkStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 76695005..b5cc7e56 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/ConnectionChecker.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/ConnectionChecker.scala
index 9202a192..17dfb51f 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/ConnectionChecker.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/ConnectionChecker.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 fe0ecc97..4e693899 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 b64b6e41..504053db 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 70ab3f5f..624d3cff 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/DefaultProducerStage.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/DefaultProducerStage.scala
index e0b3afe8..ac1e1895 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/DefaultProducerStage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/DefaultProducerStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/DeferredProducer.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/DeferredProducer.scala
index 58084b85..944f39e0 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/DeferredProducer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/DeferredProducer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/ExternalSingleSourceLogic.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/ExternalSingleSourceLogic.scala
index 90d28153..c3d4630f 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/ExternalSingleSourceLogic.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/ExternalSingleSourceLogic.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 f728f361..87a56426 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaSourceStage.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaSourceStage.scala
index e3739d93..2b8dbad4 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaSourceStage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/KafkaSourceStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/LoggingWithId.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/LoggingWithId.scala
index 2118fd24..848f6259 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/LoggingWithId.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/LoggingWithId.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 cae6c6f9..e83aa9b4 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 afbcce6f..ccd2569e 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/PlainSources.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/PlainSources.scala
index a0a8c14f..acd9498e 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/PlainSources.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/PlainSources.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/ProducerStage.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/ProducerStage.scala
index 62a1d5a2..31260f3e 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/ProducerStage.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/ProducerStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/SingleSourceLogic.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/SingleSourceLogic.scala
index 2a51eb20..c7726ca7 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/SingleSourceLogic.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/SingleSourceLogic.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicBuffer.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicBuffer.scala
index 13940e66..1f7d586d 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicBuffer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicBuffer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicSubscription.scala b/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicSubscription.scala
index c116a850..bc29a0a6 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicSubscription.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/internal/SourceLogicSubscription.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 9cdd6548..dff06e84 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 ff9a4754..6050cd18 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 6f50d5c2..e92f8afe 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Committer.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Committer.scala
index 8d7c2eb0..a68dc9b2 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Committer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Committer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 f737e6b4..0daa26f8 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/DiscoverySupport.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/DiscoverySupport.scala
index 37d4ad53..7d6c422f 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/DiscoverySupport.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/DiscoverySupport.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 6ffed653..8640ae16 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/PartitionAssignmentHandler.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/PartitionAssignmentHandler.scala
index 1b18fdd9..c2f8de75 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/PartitionAssignmentHandler.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/PartitionAssignmentHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Producer.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Producer.scala
index 73352d08..eac4f419 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Producer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Producer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/SendProducer.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/SendProducer.scala
index 49f95592..f961bc33 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/SendProducer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/SendProducer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Transactional.scala b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Transactional.scala
index 594e72b5..1ef5afd9 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/javadsl/Transactional.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/javadsl/Transactional.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Committer.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Committer.scala
index ca9462d6..2fc07110 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Committer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Committer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Consumer.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Consumer.scala
index 576b94d2..ffcee801 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Consumer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Consumer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/DiscoverySupport.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/DiscoverySupport.scala
index 09eaa624..d39b5926 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/DiscoverySupport.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/DiscoverySupport.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/MetadataClient.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/MetadataClient.scala
index 997ce48b..c675352e 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/MetadataClient.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/MetadataClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/PartitionAssignmentHandler.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/PartitionAssignmentHandler.scala
index 71188e57..47ef8be1 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/PartitionAssignmentHandler.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/PartitionAssignmentHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Producer.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Producer.scala
index e25ea423..f7d27f6e 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Producer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Producer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/SendProducer.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/SendProducer.scala
index 0a5ae02e..0f4bf227 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/SendProducer.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/SendProducer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Transactional.scala b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Transactional.scala
index 2af18f9a..755919fb 100644
--- a/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Transactional.scala
+++ b/core/src/main/scala/org/apache/pekko/kafka/scaladsl/Transactional.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/AssignmentTest.java b/java-tests/src/test/java/docs/javadsl/AssignmentTest.java
index 18d11346..6f4f2c70 100644
--- a/java-tests/src/test/java/docs/javadsl/AssignmentTest.java
+++ b/java-tests/src/test/java/docs/javadsl/AssignmentTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/AtLeastOnceTest.java b/java-tests/src/test/java/docs/javadsl/AtLeastOnceTest.java
index 0444860e..0c21bee4 100644
--- a/java-tests/src/test/java/docs/javadsl/AtLeastOnceTest.java
+++ b/java-tests/src/test/java/docs/javadsl/AtLeastOnceTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/ClusterShardingExample.java b/java-tests/src/test/java/docs/javadsl/ClusterShardingExample.java
index 1b14566c..2453ea26 100644
--- a/java-tests/src/test/java/docs/javadsl/ClusterShardingExample.java
+++ b/java-tests/src/test/java/docs/javadsl/ClusterShardingExample.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/ConsumerExampleTest.java b/java-tests/src/test/java/docs/javadsl/ConsumerExampleTest.java
index 00bb0689..a5405703 100644
--- a/java-tests/src/test/java/docs/javadsl/ConsumerExampleTest.java
+++ b/java-tests/src/test/java/docs/javadsl/ConsumerExampleTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/ConsumerSettingsTest.java b/java-tests/src/test/java/docs/javadsl/ConsumerSettingsTest.java
index ac92cf60..4781dc4f 100644
--- a/java-tests/src/test/java/docs/javadsl/ConsumerSettingsTest.java
+++ b/java-tests/src/test/java/docs/javadsl/ConsumerSettingsTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/FetchMetadataTest.java b/java-tests/src/test/java/docs/javadsl/FetchMetadataTest.java
index d6dabe7a..dff2800c 100644
--- a/java-tests/src/test/java/docs/javadsl/FetchMetadataTest.java
+++ b/java-tests/src/test/java/docs/javadsl/FetchMetadataTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/MetadataClientTest.java b/java-tests/src/test/java/docs/javadsl/MetadataClientTest.java
index 26c84380..c65106dc 100644
--- a/java-tests/src/test/java/docs/javadsl/MetadataClientTest.java
+++ b/java-tests/src/test/java/docs/javadsl/MetadataClientTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/ProducerSettingsTest.java b/java-tests/src/test/java/docs/javadsl/ProducerSettingsTest.java
index ba5fe74f..38dc76e6 100644
--- a/java-tests/src/test/java/docs/javadsl/ProducerSettingsTest.java
+++ b/java-tests/src/test/java/docs/javadsl/ProducerSettingsTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/ProducerTest.java b/java-tests/src/test/java/docs/javadsl/ProducerTest.java
index 020255ed..6afacab4 100644
--- a/java-tests/src/test/java/docs/javadsl/ProducerTest.java
+++ b/java-tests/src/test/java/docs/javadsl/ProducerTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/SampleData.java b/java-tests/src/test/java/docs/javadsl/SampleData.java
index 2b6b828d..7654d5e7 100644
--- a/java-tests/src/test/java/docs/javadsl/SampleData.java
+++ b/java-tests/src/test/java/docs/javadsl/SampleData.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/SchemaRegistrySerializationTest.java b/java-tests/src/test/java/docs/javadsl/SchemaRegistrySerializationTest.java
index 44a39265..31e84508 100644
--- a/java-tests/src/test/java/docs/javadsl/SchemaRegistrySerializationTest.java
+++ b/java-tests/src/test/java/docs/javadsl/SchemaRegistrySerializationTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/SendProducerTest.java b/java-tests/src/test/java/docs/javadsl/SendProducerTest.java
index bf259c38..c9f6a9dd 100644
--- a/java-tests/src/test/java/docs/javadsl/SendProducerTest.java
+++ b/java-tests/src/test/java/docs/javadsl/SendProducerTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/SerializationTest.java b/java-tests/src/test/java/docs/javadsl/SerializationTest.java
index a9491424..f1392dce 100644
--- a/java-tests/src/test/java/docs/javadsl/SerializationTest.java
+++ b/java-tests/src/test/java/docs/javadsl/SerializationTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java b/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
index 0ef31740..dd7a9e0b 100644
--- a/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
+++ b/java-tests/src/test/java/docs/javadsl/TestkitSamplesTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/TestkitTestcontainersTest.java b/java-tests/src/test/java/docs/javadsl/TestkitTestcontainersTest.java
index fcef7ee7..635216c4 100644
--- a/java-tests/src/test/java/docs/javadsl/TestkitTestcontainersTest.java
+++ b/java-tests/src/test/java/docs/javadsl/TestkitTestcontainersTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/TransactionsExampleTest.java b/java-tests/src/test/java/docs/javadsl/TransactionsExampleTest.java
index 82c36f0e..c0cf717c 100644
--- a/java-tests/src/test/java/docs/javadsl/TransactionsExampleTest.java
+++ b/java-tests/src/test/java/docs/javadsl/TransactionsExampleTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java b/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
index ea85a0d5..1db6bdad 100644
--- a/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
+++ b/java-tests/src/test/java/docs/javadsl/proto/OrderMessages.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingExtension.scala b/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingExtension.scala
index 58a0f65d..78b8963d 100644
--- a/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingExtension.scala
+++ b/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingExtension.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingJunit4.scala b/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingJunit4.scala
index ebaf128e..7e935b05 100644
--- a/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingJunit4.scala
+++ b/java-tests/src/test/scala/org/apache/pekko/kafka/tests/javadsl/LogCapturingJunit4.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala
index 16d52a3b..d622999a 100644
--- a/project/AutomaticModuleName.scala
+++ b/project/AutomaticModuleName.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt.{ Def, _ }
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index 8973dc78..0d4f11ac 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -53,7 +53,7 @@ trait CopyrightHeader extends AutoPlugin {
       |
       |  https://www.apache.org/licenses/LICENSE-2.0
       |
-      |This file is part of the Apache Pekko project, derived from Akka.
+      |This file is part of the Apache Pekko project, which was derived from Akka.
       |""".stripMargin
 
   val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0"
diff --git a/project/CopyrightHeaderForBuild.scala b/project/CopyrightHeaderForBuild.scala
index 5f5c36ad..55463346 100644
--- a/project/CopyrightHeaderForBuild.scala
+++ b/project/CopyrightHeaderForBuild.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -22,7 +22,9 @@ object CopyrightHeaderForBuild extends CopyrightHeader {
     Seq(Compile, Test).flatMap { config =>
       inConfig(config) {
         Seq(
-          config / headerSources ++= (((config / baseDirectory).value / "project") ** "*.scala").get,
+          config / headerSources ++= (((config / baseDirectory).value / "project") ** ("*.scala" || "*.sbt")).get,
+          config / headerSources ++= ((config / baseDirectory).value ** "*.sbt").get,
+          headerMappings := headerMappings.value ++ Map(HeaderFileType("sbt") -> cStyleComment),
           headerMappings := headerMappings.value ++ Map(HeaderFileType.scala -> cStyleComment))
       }
     }
diff --git a/project/CopyrightHeaderForProtobuf.scala b/project/CopyrightHeaderForProtobuf.scala
index 33baf482..a76ca695 100644
--- a/project/CopyrightHeaderForProtobuf.scala
+++ b/project/CopyrightHeaderForProtobuf.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 7de50438..abaf5032 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import Versions._
diff --git a/project/PackagingTypePlugin.scala b/project/PackagingTypePlugin.scala
index 9449a2d1..a0b75dab 100644
--- a/project/PackagingTypePlugin.scala
+++ b/project/PackagingTypePlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt._
diff --git a/project/ParadoxSettings.scala b/project/ParadoxSettings.scala
index 2bfaa91f..d4345a4d 100644
--- a/project/ParadoxSettings.scala
+++ b/project/ParadoxSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import Versions._
diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala
index 0f680a1f..d3c803e4 100644
--- a/project/ProjectSettings.scala
+++ b/project/ProjectSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import Versions._
diff --git a/project/ResolverSettings.scala b/project/ResolverSettings.scala
index e01c8542..4982b196 100644
--- a/project/ResolverSettings.scala
+++ b/project/ResolverSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt._
diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala
index ef9f2d50..9f05252b 100644
--- a/project/VersionGenerator.scala
+++ b/project/VersionGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt._
diff --git a/project/Versions.scala b/project/Versions.scala
index 4d519497..551f0b09 100644
--- a/project/Versions.scala
+++ b/project/Versions.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import net.aichler.jupiter.sbt.Import.JupiterKeys
diff --git a/project/plugins.sbt b/project/plugins.sbt
index abb278ca..59e9149c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.9.1")
 addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
-addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5")
+addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.6")
 // discipline
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/KafkaTest.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/KafkaTest.java
index f2b4ccab..02adcf6d 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/KafkaTest.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/KafkaTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaJunit4Test.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaJunit4Test.java
index 1db0271c..2f0c27bc 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaJunit4Test.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaJunit4Test.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaTest.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaTest.java
index 28121fec..113afe7c 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaTest.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/TestcontainersKafkaTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/KafkaContainerCluster.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/KafkaContainerCluster.java
index d9d83815..3812ce6c 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/KafkaContainerCluster.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/KafkaContainerCluster.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
index 243e3546..fceeeb75 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/PekkoConnectorsKafkaContainer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/SchemaRegistryContainer.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/SchemaRegistryContainer.java
index 959de692..3e9280d9 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/SchemaRegistryContainer.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/internal/SchemaRegistryContainer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/BaseKafkaTest.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/BaseKafkaTest.java
index 524d23d7..dca7304c 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/BaseKafkaTest.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/BaseKafkaTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/KafkaJunit4Test.java b/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/KafkaJunit4Test.java
index 612b2fa4..b87ffa67 100644
--- a/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/KafkaJunit4Test.java
+++ b/testkit/src/main/java/org/apache/pekko/kafka/testkit/javadsl/KafkaJunit4Test.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ConsumerResultFactory.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ConsumerResultFactory.scala
index cde15eed..54420c8d 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ConsumerResultFactory.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/ConsumerResultFactory.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitSettings.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitSettings.scala
index b3b778c0..4f1ed45a 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitSettings.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitTestcontainersSettings.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitTestcontainersSettings.scala
index f7e50e17..db802d37 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitTestcontainersSettings.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/KafkaTestkitTestcontainersSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 16624255..7dab2a5b 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 37bffbc2..627dd273 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKitChecks.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKitChecks.scala
index 8e1631bd..93478018 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKitChecks.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/KafkaTestKitChecks.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestFrameworkInterface.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestFrameworkInterface.scala
index a466cdb3..6773b63b 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestFrameworkInterface.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/internal/TestFrameworkInterface.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 3ea3df38..c6f8f562 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/javadsl/ConsumerControlFactory.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/javadsl/ConsumerControlFactory.scala
index 63445997..dff83931 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/javadsl/ConsumerControlFactory.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/javadsl/ConsumerControlFactory.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ConsumerControlFactory.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ConsumerControlFactory.scala
index 7dece911..cfdd7f94 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ConsumerControlFactory.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ConsumerControlFactory.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 1159cabb..4519a193 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ScalatestKafkaSpec.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ScalatestKafkaSpec.scala
index d4e55193..df560b1b 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ScalatestKafkaSpec.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/ScalatestKafkaSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaLike.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaLike.scala
index aa4a29c1..7f2c47fc 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaLike.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaLike.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaPerClassLike.scala b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaPerClassLike.scala
index 65e8e84c..d5b23164 100644
--- a/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaPerClassLike.scala
+++ b/testkit/src/main/scala/org/apache/pekko/kafka/testkit/scaladsl/TestcontainersKafkaPerClassLike.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 a5dfa70f..c1b79607 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/IntegrationTests.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala b/tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
index a252f9db..037561e2 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/PartitionedSourceFailoverSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala b/tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
index 462db4e8..9c7c7879 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/PlainSourceFailoverSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala b/tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
index b09ed446..e6081dce 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/TransactionsPartitionedSourceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala b/tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
index a9e76eed..552ace46 100644
--- a/tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
+++ b/tests/src/it/scala/org/apache/pekko/kafka/TransactionsSourceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/main/proto/order.proto b/tests/src/main/proto/order.proto
index 4ce7db87..4557428f 100644
--- a/tests/src/main/proto/order.proto
+++ b/tests/src/main/proto/order.proto
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 syntax = "proto3";
diff --git a/tests/src/main/scala/org/apache/pekko/kafka/KafkaPorts.scala b/tests/src/main/scala/org/apache/pekko/kafka/KafkaPorts.scala
index ad2a6c5d..915e4bea 100644
--- a/tests/src/main/scala/org/apache/pekko/kafka/KafkaPorts.scala
+++ b/tests/src/main/scala/org/apache/pekko/kafka/KafkaPorts.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/AssignmentSpec.scala b/tests/src/test/scala/docs/scaladsl/AssignmentSpec.scala
index bf4047d2..a45ee3c3 100644
--- a/tests/src/test/scala/docs/scaladsl/AssignmentSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/AssignmentSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/AtLeastOnce.scala b/tests/src/test/scala/docs/scaladsl/AtLeastOnce.scala
index 24d62597..3aac068b 100644
--- a/tests/src/test/scala/docs/scaladsl/AtLeastOnce.scala
+++ b/tests/src/test/scala/docs/scaladsl/AtLeastOnce.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/ClusterShardingExample.scala b/tests/src/test/scala/docs/scaladsl/ClusterShardingExample.scala
index b41dfa0e..b69c150f 100644
--- a/tests/src/test/scala/docs/scaladsl/ClusterShardingExample.scala
+++ b/tests/src/test/scala/docs/scaladsl/ClusterShardingExample.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/ConsumerExample.scala b/tests/src/test/scala/docs/scaladsl/ConsumerExample.scala
index 9dcf82bb..70c099e3 100644
--- a/tests/src/test/scala/docs/scaladsl/ConsumerExample.scala
+++ b/tests/src/test/scala/docs/scaladsl/ConsumerExample.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/DocsSpecBase.scala b/tests/src/test/scala/docs/scaladsl/DocsSpecBase.scala
index a8d97158..0917bc5b 100644
--- a/tests/src/test/scala/docs/scaladsl/DocsSpecBase.scala
+++ b/tests/src/test/scala/docs/scaladsl/DocsSpecBase.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/FetchMetadata.scala b/tests/src/test/scala/docs/scaladsl/FetchMetadata.scala
index 274eda60..a1976856 100644
--- a/tests/src/test/scala/docs/scaladsl/FetchMetadata.scala
+++ b/tests/src/test/scala/docs/scaladsl/FetchMetadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/PartitionExamples.scala b/tests/src/test/scala/docs/scaladsl/PartitionExamples.scala
index 1ebc513a..b3e207dd 100644
--- a/tests/src/test/scala/docs/scaladsl/PartitionExamples.scala
+++ b/tests/src/test/scala/docs/scaladsl/PartitionExamples.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/ProducerExample.scala b/tests/src/test/scala/docs/scaladsl/ProducerExample.scala
index bbe530ba..cb81e158 100644
--- a/tests/src/test/scala/docs/scaladsl/ProducerExample.scala
+++ b/tests/src/test/scala/docs/scaladsl/ProducerExample.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala b/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
index 32f9031e..7817f985 100644
--- a/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/SchemaRegistrySerializationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/SendProducerSpec.scala b/tests/src/test/scala/docs/scaladsl/SendProducerSpec.scala
index 0b15f9c4..07e2edbf 100644
--- a/tests/src/test/scala/docs/scaladsl/SendProducerSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/SendProducerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/SerializationSpec.scala b/tests/src/test/scala/docs/scaladsl/SerializationSpec.scala
index d1a0947d..8fe8d2e1 100644
--- a/tests/src/test/scala/docs/scaladsl/SerializationSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/SerializationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/TestkitSamplesSpec.scala b/tests/src/test/scala/docs/scaladsl/TestkitSamplesSpec.scala
index cccee797..614c9c23 100644
--- a/tests/src/test/scala/docs/scaladsl/TestkitSamplesSpec.scala
+++ b/tests/src/test/scala/docs/scaladsl/TestkitSamplesSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/TransactionsExample.scala b/tests/src/test/scala/docs/scaladsl/TransactionsExample.scala
index 3e6cfbc4..6f937f6e 100644
--- a/tests/src/test/scala/docs/scaladsl/TransactionsExample.scala
+++ b/tests/src/test/scala/docs/scaladsl/TransactionsExample.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/proto/Order.scala b/tests/src/test/scala/docs/scaladsl/proto/Order.scala
index dc37f8c7..10f07e49 100644
--- a/tests/src/test/scala/docs/scaladsl/proto/Order.scala
+++ b/tests/src/test/scala/docs/scaladsl/proto/Order.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/docs/scaladsl/proto/OrderProto.scala b/tests/src/test/scala/docs/scaladsl/proto/OrderProto.scala
index 966d4ad7..5ec03366 100644
--- a/tests/src/test/scala/docs/scaladsl/proto/OrderProto.scala
+++ b/tests/src/test/scala/docs/scaladsl/proto/OrderProto.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/ConfigSettingsSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/ConfigSettingsSpec.scala
index 7707065e..815faa3a 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/ConfigSettingsSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/ConfigSettingsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/ConsumerSettingsSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/ConsumerSettingsSpec.scala
index 76ebf20f..37e6248e 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/ConsumerSettingsSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/ConsumerSettingsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/ProducerSettingsSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/ProducerSettingsSpec.scala
index 198dd825..fa1be256 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/ProducerSettingsSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/ProducerSettingsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/Repeated.scala b/tests/src/test/scala/org/apache/pekko/kafka/Repeated.scala
index 259d1a97..38839b03 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/Repeated.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/Repeated.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/TransactionsOps.scala b/tests/src/test/scala/org/apache/pekko/kafka/TransactionsOps.scala
index e136cd28..643365d5 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/TransactionsOps.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/TransactionsOps.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommitCollectorStageSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommitCollectorStageSpec.scala
index a6a2d205..e8e575e2 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommitCollectorStageSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommitCollectorStageSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 e6f6e6f1..098de532 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingWithMockSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingWithMockSpec.scala
index 76794d49..fd283bb1 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingWithMockSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/CommittingWithMockSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConnectionCheckerSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConnectionCheckerSpec.scala
index b988335e..ff815d56 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConnectionCheckerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConnectionCheckerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerDummy.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerDummy.scala
index c06fd837..93073673 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerDummy.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/ConsumerDummy.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 127cddb0..b6fd6d83 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 18b7c62b..7bd3b16a 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 5899bd74..6840827c 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 1c9bb21e..8b1468dd 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/EnhancedConfigSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/EnhancedConfigSpec.scala
index c91ea28f..1f6efbbb 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/EnhancedConfigSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/EnhancedConfigSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/OffsetAggregationSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/OffsetAggregationSpec.scala
index f43a917a..890acccf 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/OffsetAggregationSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/OffsetAggregationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 8a693413..2c62a215 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 158f8e53..2dbdb290 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/internal/SubscriptionsSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/internal/SubscriptionsSpec.scala
index f8e9b4ac..4d1bacb9 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/internal/SubscriptionsSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/internal/SubscriptionsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/javadsl/ControlSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/javadsl/ControlSpec.scala
index 541b0f76..f66bd4bd 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/javadsl/ControlSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/javadsl/ControlSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittableSinkSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittableSinkSpec.scala
index 11e3c1ce..67de2480 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittableSinkSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittableSinkSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittingSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittingSpec.scala
index ca311cfd..44efbb53 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittingSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/CommittingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ConnectionCheckerSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ConnectionCheckerSpec.scala
index ce67baee..45b73939 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ConnectionCheckerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ConnectionCheckerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ControlSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ControlSpec.scala
index 26071a6e..efd93813 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ControlSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ControlSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/IntegrationSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/IntegrationSpec.scala
index 1caa499e..d8b20fae 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/IntegrationSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/IntegrationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MetadataClientSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MetadataClientSpec.scala
index 0d6e306e..e9f4f082 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MetadataClientSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MetadataClientSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredConsumerSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredConsumerSpec.scala
index 0e5e2801..5eacbfbf 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredConsumerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredConsumerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredProducerSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredProducerSpec.scala
index 5b346a73..eb1048c9 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredProducerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MisconfiguredProducerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MultiConsumerSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MultiConsumerSpec.scala
index 99124d8c..cca5756f 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MultiConsumerSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/MultiConsumerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/PartitionedSourcesSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/PartitionedSourcesSpec.scala
index 955bd397..3b31a1e1 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/PartitionedSourcesSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/PartitionedSourcesSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceExtSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceExtSpec.scala
index dbbba2fa..231aed24 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceExtSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/RebalanceExtSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 5b2d457a..a673428a 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ReconnectSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ReconnectSpec.scala
index 596e28d2..66776cf0 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ReconnectSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/ReconnectSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 20bbe227..476904f5 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/SpecBase.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/SpecBase.scala
index 2684fb59..4de681c3 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/SpecBase.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/SpecBase.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 aeed1351..2711a7b3 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TransactionsSpec.scala b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TransactionsSpec.scala
index e97ef021..a1d52fec 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TransactionsSpec.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/scaladsl/TransactionsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
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 139effab..5d4f2401 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
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/tests/LogbackUtil.scala b/tests/src/test/scala/org/apache/pekko/kafka/tests/LogbackUtil.scala
index 42fd66dc..1b181541 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/tests/LogbackUtil.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/tests/LogbackUtil.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/tests/src/test/scala/org/apache/pekko/kafka/tests/scaladsl/LogCapturing.scala b/tests/src/test/scala/org/apache/pekko/kafka/tests/scaladsl/LogCapturing.scala
index a35dc6ed..33f9a645 100644
--- a/tests/src/test/scala/org/apache/pekko/kafka/tests/scaladsl/LogCapturing.scala
+++ b/tests/src/test/scala/org/apache/pekko/kafka/tests/scaladsl/LogCapturing.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org