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/pekko-connectors.git


The following commit(s) were added to refs/heads/main by this push:
     new 3e04c57c5 add jakartams to sbt project list (#718)
3e04c57c5 is described below

commit 3e04c57c5e8e252bc4bbb79b78ca347b77d33801
Author: PJ Fanning <[email protected]>
AuthorDate: Wed Jul 3 23:21:31 2024 +0100

    add jakartams to sbt project list (#718)
    
    * add jakartams to sbt project list
    
    * mima check issue
    
    * sbt issue
    
    * change imports
    
    * change imports
    
    * fix doc issues
    
    * Update JmsConnectionStatusSpec.scala
    
    * javafmt
---
 build.sbt                                            |  4 +++-
 docs/src/main/paradox/jms/consumer.md                | 10 +++++-----
 docs/src/main/paradox/jms/index.md                   |  2 ++
 docs/src/main/paradox/jms/producer.md                | 16 ++++++++--------
 .../jakartams/javadsl/JmsConnectorState.java         | 10 +++++++---
 .../jakartams/javadsl/JmsConsumerControl.java        | 10 +++++-----
 .../jakartams/javadsl/JmsProducerStatus.java         | 10 +++++-----
 .../jakartams/ConnectionRetrySettings.scala          |  5 +++--
 .../stream/connectors/jakartams/Destinations.scala   |  3 ++-
 .../stream/connectors/jakartams/Envelopes.scala      |  3 ++-
 .../stream/connectors/jakartams/JmsMessages.scala    | 10 +++++-----
 .../stream/connectors/jakartams/JmsSettings.scala    |  3 ++-
 .../connectors/jakartams/impl/JmsBrowseStage.scala   |  8 ++++----
 .../connectors/jakartams/impl/JmsConnector.scala     | 20 ++++++++++----------
 .../connectors/jakartams/impl/JmsConsumerStage.scala |  8 ++++----
 .../jakartams/impl/JmsInternalMatValues.scala        |  8 ++++----
 .../jakartams/impl/JmsMessageProducer.scala          |  4 ++--
 .../connectors/jakartams/impl/JmsMessageReader.scala |  8 ++++----
 .../connectors/jakartams/impl/JmsProducerStage.scala | 18 +++++++++---------
 .../connectors/jakartams/impl/JmsTxSourceStage.scala |  8 ++++----
 .../stream/connectors/jakartams/impl/Sessions.scala  |  6 +++---
 .../jakartams/impl/SoftReferenceCache.scala          |  2 +-
 .../connectors/jakartams/javadsl/JmsConsumer.scala   |  8 ++++----
 .../connectors/jakartams/javadsl/JmsProducer.scala   | 14 +++++++-------
 .../jakartams/scaladsl/JmsConnectorState.scala       | 10 +++++-----
 .../connectors/jakartams/scaladsl/JmsConsumer.scala  | 10 +++++-----
 .../connectors/jakartams/scaladsl/JmsProducer.scala  | 10 +++++-----
 .../connectors/jakartams/scaladsl/package.scala      |  8 ++++----
 .../docs/scaladsl/JmsBufferedAckConnectorsSpec.scala | 13 +++++++------
 .../test/scala/docs/scaladsl/JmsConnectorsSpec.scala | 12 ++++++------
 .../jakartams/JmsConnectionStatusSpec.scala          | 14 +++++---------
 .../connectors/jakartams/JmsProducerRetrySpec.scala  |  7 ++++---
 .../pekko/stream/connectors/jakartams/JmsSpec.scala  |  7 ++++---
 .../jakartams/impl/JmsMessageProducerSpec.scala      |  3 ++-
 .../jakartams/scaladsl/JmsAckConnectorsSpec.scala    | 10 +++++-----
 35 files changed, 157 insertions(+), 145 deletions(-)

diff --git a/build.sbt b/build.sbt
index e480559fc..a2c84cc6c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -43,6 +43,7 @@ lazy val userProjects: Seq[ProjectReference] = 
List[ProjectReference](
   huaweiPushKit,
   influxdb,
   ironmq,
+  jakartams,
   jms,
   jsonStreaming,
   kinesis,
@@ -475,6 +476,7 @@ lazy val billOfMaterials = Project("bill-of-materials", 
file("bill-of-materials"
     description := s"${description.value} (depending on Scala 
${CrossVersion.binaryScalaVersion(scalaVersion.value)})")
 
 val mimaCompareVersion = "1.0.2"
+val noMimaChecks = Set("slick", "couchbase3", "jakartams", 
"aws.api.pekko.http")
 
 def pekkoConnectorProject(projectId: String,
     moduleName: String,
@@ -488,7 +490,7 @@ def pekkoConnectorProject(projectId: String,
       licenses := List(License.Apache2),
       AutomaticModuleName.settings(s"pekko.stream.connectors.$moduleName"),
       mimaPreviousArtifacts := {
-        if (moduleName == "slick" || moduleName == "couchbase3" || moduleName 
== "aws.api.pekko.http") {
+        if (noMimaChecks.contains(moduleName)) {
           Set.empty
         } else {
           Set(organization.value %% name.value % mimaCompareVersion)
diff --git a/docs/src/main/paradox/jms/consumer.md 
b/docs/src/main/paradox/jms/consumer.md
index 4b5f005f7..3b24c473a 100644
--- a/docs/src/main/paradox/jms/consumer.md
+++ b/docs/src/main/paradox/jms/consumer.md
@@ -12,11 +12,11 @@ The JMS message model supports several types of message 
bodies in (see @javadoc[
 
 ## Receiving messages
 
-@apidoc[JmsConsumer$] offers factory methods to consume JMS messages in a 
number of ways.
+@apidoc[org.apache.pekko.stream.connectors.jms.*.JmsConsumer$] offers factory 
methods to consume JMS messages in a number of ways.
 
 This examples shows how to listen to a JMS queue and emit 
@javadoc[javax.jms.Message](javax.jms.Message) elements into the stream.
 
-The materialized value @apidoc[JmsConsumerControl] is used to shut down the 
consumer (it is a @apidoc[KillSwitch]) and offers the possibility to inspect 
the connectivity state of the consumer. 
+The materialized value 
@apidoc[org.apache.pekko.stream.connectors.jms.*.JmsConsumerControl] is used to 
shut down the consumer (it is a @apidoc[KillSwitch]) and offers the possibility 
to inspect the connectivity state of the consumer. 
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#jms-source }
@@ -38,7 +38,7 @@ Java
 
 The created @javadoc[ConnectionFactory](javax.jms.ConnectionFactory) is then 
used for the creation of the different JMS sources.
 
-The @apidoc[JmsConsumerSettings$] factories allow for passing the actor system 
to read from the default `pekko.connectors.jms.consumer` section, or you may 
pass a `Config` instance which is resolved to a section of the same structure. 
+The @apidoc[org.apache.pekko.stream.connectors.jms.JmsConsumerSettings$] 
factories allow for passing the actor system to read from the default 
`pekko.connectors.jms.consumer` section, or you may pass a `Config` instance 
which is resolved to a section of the same structure. 
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsSettingsSpec.scala) { 
#consumer-settings }
@@ -198,8 +198,8 @@ Java
 
 ## Request / Reply
 
-The request / reply pattern can be implemented by streaming a 
@apidoc[JmsConsumer$]
-to a @apidoc[JmsProducer$],
+The request / reply pattern can be implemented by streaming a 
@apidoc[org.apache.pekko.stream.connectors.jms.*.JmsConsumer$]
+to a @apidoc[org.apache.pekko.stream.connectors.jms.*.JmsProducer$],
 with a stage in between that extracts the `ReplyTo` and `CorrelationID` from 
the original message and adds them to the response.
 
 Scala
diff --git a/docs/src/main/paradox/jms/index.md 
b/docs/src/main/paradox/jms/index.md
index b37681acc..f46b4797f 100644
--- a/docs/src/main/paradox/jms/index.md
+++ b/docs/src/main/paradox/jms/index.md
@@ -10,6 +10,8 @@ The Java Message Service (JMS) API is a Java message-oriented 
middleware API for
 
 The Apache Pekko Connectors JMS connector provides Apache Pekko Stream sources 
and sinks to connect to JMS providers.
 
+In v1.1.0, there is also a Jakarta MS connector that provides the equivalent 
support for [Jakarta 
Messaging](https://jakarta.ee/learn/docs/jakartaee-tutorial/current/messaging/jms-concepts/jms-concepts.html).
+
 @@project-info{ projectId="jms" }
 
 ## Artifacts
diff --git a/docs/src/main/paradox/jms/producer.md 
b/docs/src/main/paradox/jms/producer.md
index 0c89c17c2..833a1f0f3 100644
--- a/docs/src/main/paradox/jms/producer.md
+++ b/docs/src/main/paradox/jms/producer.md
@@ -38,8 +38,8 @@ The created 
@javadoc[ConnectionFactory](javax.jms.ConnectionFactory) is then use
 
 ### A `JmsMessage` sub-type sink
 
-Use a case class with the subtype of @apidoc[JmsMessage] to wrap the messages 
you want to send and optionally set message specific properties or headers.
-@apidoc[JmsProducer$] contains factory methods to facilitate the creation of 
sinks according to the message type.
+Use a case class with the subtype of 
@apidoc[org.apache.pekko.stream.connectors.jms.JmsMessage] to wrap the messages 
you want to send and optionally set message specific properties or headers.
+@apidoc[org.apache.pekko.stream.connectors.jms.*.JmsProducer$] contains 
factory methods to facilitate the creation of sinks according to the message 
type.
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#create-jms-sink }
@@ -50,7 +50,7 @@ Java
 
 #### Setting JMS message properties
 
-For every @apidoc[JmsMessage] you can set JMS message properties.
+For every @apidoc[org.apache.pekko.stream.connectors.jms.JmsMessage] you can 
set JMS message properties.
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#create-messages-with-properties }
@@ -60,7 +60,7 @@ Java
 
 
 #### Setting JMS message header attributes
-For every @apidoc[JmsMessage] you can set also JMS message headers.
+For every @apidoc[org.apache.pekko.stream.connectors.jms.JmsMessage] you can 
set also JMS message headers.
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#create-messages-with-headers }
@@ -73,7 +73,7 @@ Java
 
 #### Text sinks
 
-Create a sink, that accepts and forwards @apidoc[JmsTextMessage$]s to the JMS 
provider:
+Create a sink, that accepts and forwards 
@apidoc[org.apache.pekko.stream.connectors.jms.JmsTextMessage$]s to the JMS 
provider:
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#text-sink }
@@ -83,7 +83,7 @@ Java
 
 #### Byte array sinks
 
-Create a sink, that accepts and forwards @apidoc[JmsByteMessage$]s to the JMS 
provider.
+Create a sink, that accepts and forwards 
@apidoc[org.apache.pekko.stream.connectors.jms.JmsByteMessage$]s to the JMS 
provider.
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#bytearray-sink }
@@ -94,7 +94,7 @@ Java
 
 #### Map message sink
 
-Create a sink, that accepts and forwards @apidoc[JmsMapMessage$]s to the JMS 
provider:
+Create a sink, that accepts and forwards 
@apidoc[org.apache.pekko.stream.connectors.jms.JmsMapMessage$]s to the JMS 
provider:
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#map-sink }
@@ -107,7 +107,7 @@ Java
 
 Create and configure ActiveMQ connection factory to support serialization.
 See [ActiveMQ Security](https://activemq.apache.org/objectmessage.html) for 
more information on this.
-Create a sink, that accepts and forwards @apidoc[JmsObjectMessage$]s to the 
JMS provider:
+Create a sink, that accepts and forwards 
@apidoc[org.apache.pekko.stream.connectors.jms.JmsObjectMessage$]s to the JMS 
provider:
 
 Scala
 : @@snip [snip](/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala) { 
#object-sink }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
similarity index 83%
rename from 
jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
rename to 
jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
index 36485fb04..a1598efa1 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
+++ 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConnectorState.java
@@ -14,7 +14,11 @@
 package org.apache.pekko.stream.connectors.jakartams.javadsl;
 
 public enum JmsConnectorState {
-
-    Disconnected, Connecting, Connected, Completing, Completed, Failing, Failed
-
+  Disconnected,
+  Connecting,
+  Connected,
+  Completing,
+  Completed,
+  Failing,
+  Failed
 }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
similarity index 73%
rename from 
jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
rename to 
jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
index a8bbb7428..ed4a570fc 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
+++ 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumerControl.java
@@ -19,9 +19,9 @@ import org.apache.pekko.stream.javadsl.Source;
 
 public interface JmsConsumerControl extends KillSwitch {
 
-    /**
-     * source that provides connector status change information.
-     * Only the most recent connector state is buffered if the source is not 
consumed.
-     */
-    Source<JmsConnectorState, NotUsed> connectorState();
+  /**
+   * source that provides connector status change information. Only the most 
recent connector state
+   * is buffered if the source is not consumed.
+   */
+  Source<JmsConnectorState, NotUsed> connectorState();
 }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
similarity index 70%
rename from 
jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
rename to 
jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
index 0798f65f6..644d65197 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
+++ 
b/jakartams/src/main/java/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducerStatus.java
@@ -18,9 +18,9 @@ import org.apache.pekko.stream.javadsl.Source;
 
 public interface JmsProducerStatus {
 
-    /**
-     * source that provides connector status change information.
-     * Only the most recent connector state is buffered if the source is not 
consumed.
-     */
-    Source<JmsConnectorState, NotUsed> connectorState();
+  /**
+   * source that provides connector status change information. Only the most 
recent connector state
+   * is buffered if the source is not consumed.
+   */
+  Source<JmsConnectorState, NotUsed> connectorState();
 }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/ConnectionRetrySettings.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/ConnectionRetrySettings.scala
index 3a4c33589..1802720f1 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/ConnectionRetrySettings.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/ConnectionRetrySettings.scala
@@ -14,8 +14,9 @@
 package org.apache.pekko.stream.connectors.jakartams
 
 import com.typesafe.config.Config
-import org.apache.pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
-import org.apache.pekko.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import pekko.util.JavaDurationConverters._
 
 import scala.concurrent.duration._
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Destinations.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Destinations.scala
index 6d9423d09..a74a93dc3 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Destinations.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Destinations.scala
@@ -14,7 +14,8 @@
 package org.apache.pekko.stream.connectors.jakartams
 
 import jakarta.jms
-import org.apache.pekko.util.FunctionConverters._
+import org.apache.pekko
+import pekko.util.FunctionConverters._
 
 /**
  * A destination to send to/receive from.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Envelopes.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Envelopes.scala
index 367b19037..25c4a32b5 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Envelopes.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/Envelopes.scala
@@ -14,7 +14,8 @@
 package org.apache.pekko.stream.connectors.jakartams
 
 import jakarta.jms
-import org.apache.pekko.stream.connectors.jakartams.impl.{ JmsAckSession, 
JmsSession }
+import org.apache.pekko
+import pekko.stream.connectors.jakartams.impl.{ JmsAckSession, JmsSession }
 
 import java.util.concurrent.atomic.AtomicBoolean
 import scala.concurrent.{ Future, Promise }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsMessages.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsMessages.scala
index 3913a5855..d3c78c0c9 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsMessages.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsMessages.scala
@@ -15,11 +15,11 @@ package org.apache.pekko.stream.connectors.jakartams
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.NotUsed
-import org.apache.pekko.stream.connectors.jakartams.impl.JmsMessageReader._
-import org.apache.pekko.util.ByteString
-import org.apache.pekko.util.OptionConverters._
-import org.apache.pekko.util.ccompat.JavaConverters._
+import pekko.NotUsed
+import pekko.stream.connectors.jakartams.impl.JmsMessageReader._
+import pekko.util.ByteString
+import pekko.util.OptionConverters._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Base interface for messages handled by JmsProducers. Sub-classes support 
pass-through or use [[pekko.NotUsed]] as type for pass-through.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsSettings.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsSettings.scala
index 7ddadc8c9..ad4e6d468 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsSettings.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsSettings.scala
@@ -14,7 +14,8 @@
 package org.apache.pekko.stream.connectors.jakartams
 
 import jakarta.jms
-import org.apache.pekko.annotation.DoNotInherit
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
 
 /**
  * Shared settings for all JMS stages.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsBrowseStage.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsBrowseStage.scala
index 346f10fdf..13d5db579 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsBrowseStage.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsBrowseStage.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.connectors.jakartams.{ Destination, 
JmsBrowseSettings }
-import org.apache.pekko.stream.stage.{ GraphStage, GraphStageLogic, OutHandler 
}
-import org.apache.pekko.stream.{ ActorAttributes, Attributes, Outlet, 
SourceShape }
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams.{ Destination, JmsBrowseSettings }
+import pekko.stream.stage.{ GraphStage, GraphStageLogic, OutHandler }
+import pekko.stream.{ ActorAttributes, Attributes, Outlet, SourceShape }
 
 /**
  * Internal API.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConnector.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConnector.scala
index 965d4b991..c9237a9c8 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConnector.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConnector.scala
@@ -15,16 +15,16 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.dispatch.ExecutionContexts
-import org.apache.pekko.pattern.after
-import org.apache.pekko.stream.connectors.jakartams._
-import 
org.apache.pekko.stream.connectors.jakartams.impl.InternalConnectionState._
-import org.apache.pekko.stream.scaladsl.{ BroadcastHub, Keep, Sink, Source, 
SourceQueueWithComplete }
-import org.apache.pekko.stream.stage.{ AsyncCallback, StageLogging, 
TimerGraphStageLogic }
-import org.apache.pekko.stream.{ ActorAttributes, Attributes, OverflowStrategy 
}
-import org.apache.pekko.{ Done, NotUsed }
+import pekko.actor.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.dispatch.ExecutionContexts
+import pekko.pattern.after
+import pekko.stream.connectors.jakartams._
+import pekko.stream.connectors.jakartams.impl.InternalConnectionState._
+import pekko.stream.scaladsl.{ BroadcastHub, Keep, Sink, Source, 
SourceQueueWithComplete }
+import pekko.stream.stage.{ AsyncCallback, StageLogging, TimerGraphStageLogic }
+import pekko.stream.{ ActorAttributes, Attributes, OverflowStrategy }
+import pekko.{ Done, NotUsed }
 
 import java.util.concurrent.atomic.AtomicReference
 import scala.concurrent.{ ExecutionContext, Future, Promise }
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConsumerStage.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConsumerStage.scala
index c228a64e4..b265cd3e2 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConsumerStage.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsConsumerStage.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream._
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.stage._
+import pekko.annotation.InternalApi
+import pekko.stream._
+import pekko.stream.connectors.jakartams._
+import pekko.stream.stage._
 
 import java.util.concurrent.Semaphore
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsInternalMatValues.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsInternalMatValues.scala
index a9667d0ca..c2b9eec20 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsInternalMatValues.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsInternalMatValues.scala
@@ -14,10 +14,10 @@
 package org.apache.pekko.stream.connectors.jakartams.impl
 
 import org.apache.pekko
-import org.apache.pekko.NotUsed
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.KillSwitch
-import org.apache.pekko.stream.scaladsl.Source
+import pekko.NotUsed
+import pekko.annotation.InternalApi
+import pekko.stream.KillSwitch
+import pekko.stream.scaladsl.Source
 
 /**
  * Internal API.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducer.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducer.scala
index f95b434ce..8dd2d5688 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducer.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducer.scala
@@ -15,8 +15,8 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.connectors.jakartams._
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams._
 
 /**
  * Internal API.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageReader.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageReader.scala
index 54077e7bf..afec83e75 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageReader.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageReader.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.util.ByteString
-import org.apache.pekko.util.ccompat.JavaConverters._
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams._
+import pekko.util.ByteString
+import pekko.util.ccompat.JavaConverters._
 
 import scala.annotation.tailrec
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsProducerStage.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsProducerStage.scala
index e62198e35..8d6122f85 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsProducerStage.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsProducerStage.scala
@@ -15,15 +15,15 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.ActorAttributes.SupervisionStrategy
-import org.apache.pekko.stream._
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.impl.Buffer
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.stream.stage._
-import org.apache.pekko.util.OptionVal
-import org.apache.pekko.{ Done, NotUsed }
+import pekko.annotation.InternalApi
+import pekko.stream.ActorAttributes.SupervisionStrategy
+import pekko.stream._
+import pekko.stream.connectors.jakartams._
+import pekko.stream.impl.Buffer
+import pekko.stream.scaladsl.Source
+import pekko.stream.stage._
+import pekko.util.OptionVal
+import pekko.{ Done, NotUsed }
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsTxSourceStage.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsTxSourceStage.scala
index 88caf7338..be8bc499e 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsTxSourceStage.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsTxSourceStage.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.stage.{ GraphStageLogic, 
GraphStageWithMaterializedValue }
-import org.apache.pekko.stream.{ Attributes, Outlet, SourceShape }
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams._
+import pekko.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue }
+import pekko.stream.{ Attributes, Outlet, SourceShape }
 
 import scala.concurrent.{ Await, TimeoutException }
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/Sessions.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/Sessions.scala
index 1c2250374..5b5e3837f 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/Sessions.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/Sessions.scala
@@ -15,9 +15,9 @@ package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.stream.connectors.jakartams.{ Destination, 
DurableTopic }
-import org.apache.pekko.util.OptionVal
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams.{ Destination, DurableTopic }
+import pekko.util.OptionVal
 
 import java.util.concurrent.ArrayBlockingQueue
 import scala.annotation.tailrec
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/SoftReferenceCache.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/SoftReferenceCache.scala
index 9a780c3cb..6de89c2b2 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/SoftReferenceCache.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/impl/SoftReferenceCache.scala
@@ -14,7 +14,7 @@
 package org.apache.pekko.stream.connectors.jakartams.impl
 
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
+import pekko.annotation.InternalApi
 
 import scala.collection.mutable
 import scala.ref.SoftReference
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumer.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumer.scala
index cc2f695b5..f84b53707 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumer.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsConsumer.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams.javadsl
 
 import jakarta.jms.Message
 import org.apache.pekko
-import org.apache.pekko.NotUsed
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.javadsl.Source
-import org.apache.pekko.util.ccompat.JavaConverters._
+import pekko.NotUsed
+import pekko.stream.connectors.jakartams._
+import pekko.stream.javadsl.Source
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Factory methods to create JMS consumers.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducer.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducer.scala
index 18663ce33..a00a83c6c 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducer.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/javadsl/JmsProducer.scala
@@ -14,13 +14,13 @@
 package org.apache.pekko.stream.connectors.jakartams.javadsl
 
 import org.apache.pekko
-import org.apache.pekko.stream.connectors.jakartams.{ scaladsl, JmsEnvelope, 
JmsMessage, JmsProducerSettings }
-import org.apache.pekko.stream.javadsl.Source
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep }
-import org.apache.pekko.util.ByteString
-import org.apache.pekko.util.FutureConverters._
-import org.apache.pekko.util.ccompat.JavaConverters._
-import org.apache.pekko.{ Done, NotUsed }
+import pekko.stream.connectors.jakartams.{ scaladsl, JmsEnvelope, JmsMessage, 
JmsProducerSettings }
+import pekko.stream.javadsl.Source
+import pekko.stream.scaladsl.{ Flow, Keep }
+import pekko.util.ByteString
+import pekko.util.FutureConverters._
+import pekko.util.ccompat.JavaConverters._
+import pekko.{ Done, NotUsed }
 
 import java.util.concurrent.CompletionStage
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConnectorState.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConnectorState.scala
index f093d77a4..11799c13e 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConnectorState.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConnectorState.scala
@@ -14,11 +14,11 @@
 package org.apache.pekko.stream.connectors.jakartams.scaladsl
 
 import org.apache.pekko
-import org.apache.pekko.NotUsed
-import org.apache.pekko.stream.KillSwitch
-import org.apache.pekko.stream.connectors.jakartams.javadsl
-import 
org.apache.pekko.stream.connectors.jakartams.scaladsl.JmsConnectorState._
-import org.apache.pekko.stream.scaladsl.Source
+import pekko.NotUsed
+import pekko.stream.KillSwitch
+import pekko.stream.connectors.jakartams.javadsl
+import pekko.stream.connectors.jakartams.scaladsl.JmsConnectorState._
+import pekko.stream.scaladsl.Source
 
 trait JmsProducerStatus {
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConsumer.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConsumer.scala
index 7ceb24873..80218d43c 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConsumer.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsConsumer.scala
@@ -15,11 +15,11 @@ package 
org.apache.pekko.stream.connectors.jakartams.scaladsl
 
 import jakarta.jms
 import org.apache.pekko
-import org.apache.pekko.NotUsed
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.connectors.jakartams.impl._
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.util.ccompat.JavaConverters._
+import pekko.NotUsed
+import pekko.stream.connectors.jakartams._
+import pekko.stream.connectors.jakartams.impl._
+import pekko.stream.scaladsl.Source
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Factory methods to create JMS consumers.
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsProducer.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsProducer.scala
index 8b3b50386..17a2976a7 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsProducer.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsProducer.scala
@@ -14,11 +14,11 @@
 package org.apache.pekko.stream.connectors.jakartams.scaladsl
 
 import org.apache.pekko
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.connectors.jakartams.impl.{ 
JmsProducerMatValue, JmsProducerStage }
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
-import org.apache.pekko.util.ByteString
-import org.apache.pekko.{ Done, NotUsed }
+import pekko.stream.connectors.jakartams._
+import pekko.stream.connectors.jakartams.impl.{ JmsProducerMatValue, 
JmsProducerStage }
+import pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
+import pekko.util.ByteString
+import pekko.{ Done, NotUsed }
 
 import scala.concurrent.Future
 
diff --git 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/package.scala
 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/package.scala
index 0a5b9e04a..293ea480f 100644
--- 
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/package.scala
+++ 
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/package.scala
@@ -14,10 +14,10 @@
 package org.apache.pekko.stream.connectors.jakartams
 
 import org.apache.pekko
-import org.apache.pekko.annotation.InternalApi
-import 
org.apache.pekko.stream.connectors.jakartams.impl.InternalConnectionState
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.{ Done, NotUsed }
+import pekko.annotation.InternalApi
+import pekko.stream.connectors.jakartams.impl.InternalConnectionState
+import pekko.stream.scaladsl.Source
+import pekko.{ Done, NotUsed }
 
 import scala.util.{ Failure, Success }
 
diff --git 
a/jakartams/src/test/scala/docs/scaladsl/JmsBufferedAckConnectorsSpec.scala 
b/jakartams/src/test/scala/docs/scaladsl/JmsBufferedAckConnectorsSpec.scala
index 30fa145dc..7738f3a89 100644
--- a/jakartams/src/test/scala/docs/scaladsl/JmsBufferedAckConnectorsSpec.scala
+++ b/jakartams/src/test/scala/docs/scaladsl/JmsBufferedAckConnectorsSpec.scala
@@ -15,12 +15,13 @@ package docs.scaladsl
 
 import jakarta.jms.{ JMSException, TextMessage }
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants
-import org.apache.pekko.Done
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.connectors.jakartams.scaladsl.{ JmsConsumer, 
JmsConsumerControl, JmsProducer }
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
-import org.apache.pekko.stream.testkit.scaladsl.TestSink
-import org.apache.pekko.stream.{ KillSwitches, ThrottleMode }
+import org.apache.pekko
+import pekko.Done
+import pekko.stream.connectors.jakartams._
+import pekko.stream.connectors.jakartams.scaladsl.{ JmsConsumer, 
JmsConsumerControl, JmsProducer }
+import pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.stream.{ KillSwitches, ThrottleMode }
 import org.scalatest.Inspectors._
 import org.scalatest.time.Span.convertSpanToDuration
 
diff --git a/jakartams/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala 
b/jakartams/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
index 726d8eabc..c34ee649a 100644
--- a/jakartams/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
+++ b/jakartams/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
@@ -15,11 +15,12 @@ package docs.scaladsl
 
 import jakarta.jms._
 import org.apache.activemq.artemis.jms.client.{ ActiveMQConnectionFactory, 
ActiveMQQueue, ActiveMQSession }
-import org.apache.pekko.stream._
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.connectors.jakartams.scaladsl._
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
-import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko
+import pekko.stream._
+import pekko.stream.connectors.jakartams._
+import pekko.stream.connectors.jakartams.scaladsl._
+import pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
+import pekko.{ Done, NotUsed }
 import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
@@ -1131,7 +1132,6 @@ class JmsConnectorsSpec extends JmsSpec {
   }
 
   "publish and subscribe with a durable subscription" in withServer() { server 
=>
-    import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory
     val producerConnectionFactory = server.createConnectionFactory
     // #create-connection-factory-with-client-id
     val consumerConnectionFactory = server.createConnectionFactory
diff --git 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsConnectionStatusSpec.scala
 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsConnectionStatusSpec.scala
index 22012de95..000c6fef2 100644
--- 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsConnectionStatusSpec.scala
+++ 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsConnectionStatusSpec.scala
@@ -15,15 +15,11 @@ package org.apache.pekko.stream.connectors.jakartams
 
 import com.github.pjfanning.jakartamswrapper.WrappedConnectionFactory
 import jakarta.jms._
-import org.apache.pekko.stream.OverflowStrategy
-import 
org.apache.pekko.stream.connectors.jakartams.scaladsl.JmsConnectorState._
-import org.apache.pekko.stream.connectors.jakartams.scaladsl.{
-  JmsConnectorState,
-  JmsConsumer,
-  JmsProducer,
-  JmsProducerStatus
-}
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, 
SinkQueueWithCancel, Source }
+import org.apache.pekko
+import pekko.stream.OverflowStrategy
+import pekko.stream.connectors.jakartams.scaladsl.JmsConnectorState._
+import pekko.stream.connectors.jakartams.scaladsl.{ JmsConnectorState, 
JmsConsumer, JmsProducer, JmsProducerStatus }
+import pekko.stream.scaladsl.{ Flow, Keep, Sink, SinkQueueWithCancel, Source }
 import org.mockito.ArgumentMatchers.{ any, anyBoolean, anyInt }
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
diff --git 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsProducerRetrySpec.scala
 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsProducerRetrySpec.scala
index 7dfdcb8d0..4c84d94ed 100644
--- 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsProducerRetrySpec.scala
+++ 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsProducerRetrySpec.scala
@@ -15,9 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams
 
 import com.github.pjfanning.jakartamswrapper.WrappedConnectionFactory
 import jakarta.jms.{ JMSException, Message, TextMessage }
-import org.apache.pekko.stream._
-import org.apache.pekko.stream.connectors.jakartams.scaladsl.{ JmsConsumer, 
JmsProducer }
-import org.apache.pekko.stream.scaladsl.{ Keep, Sink, Source }
+import org.apache.pekko
+import pekko.stream._
+import pekko.stream.connectors.jakartams.scaladsl.{ JmsConsumer, JmsProducer }
+import pekko.stream.scaladsl.{ Keep, Sink, Source }
 import org.mockito.ArgumentMatchers.{ any, anyInt, anyLong }
 import org.mockito.Mockito.when
 import org.mockito.invocation.InvocationOnMock
diff --git 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsSpec.scala
 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsSpec.scala
index cec6f9176..96cc66077 100644
--- 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsSpec.scala
+++ 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/JmsSpec.scala
@@ -15,9 +15,10 @@ package org.apache.pekko.stream.connectors.jakartams
 
 import jakarta.jms._
 import org.apache.activemq.artemis.junit.EmbeddedActiveMQResource
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.stream.connectors.testkit.scaladsl.LogCapturing
-import org.apache.pekko.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.connectors.testkit.scaladsl.LogCapturing
+import pekko.testkit.TestKit
 import org.mockito.ArgumentMatchers.{ any, anyBoolean, anyInt }
 import org.mockito.Mockito.when
 import org.scalatest.concurrent.{ Eventually, ScalaFutures }
diff --git 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducerSpec.scala
 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducerSpec.scala
index 60610ec0d..aed282a50 100644
--- 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducerSpec.scala
+++ 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/impl/JmsMessageProducerSpec.scala
@@ -14,7 +14,8 @@
 package org.apache.pekko.stream.connectors.jakartams.impl
 
 import jakarta.jms.{ Destination => JmsDestination, _ }
-import org.apache.pekko.stream.connectors.jakartams.{ Destination, _ }
+import org.apache.pekko
+import pekko.stream.connectors.jakartams.{ Destination, _ }
 import org.mockito.ArgumentMatchers.{ any, anyBoolean, anyInt, anyString }
 import org.mockito.Mockito._
 import org.scalatestplus.mockito.MockitoSugar
diff --git 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsAckConnectorsSpec.scala
 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsAckConnectorsSpec.scala
index 1b3f24c36..3795c6d10 100644
--- 
a/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsAckConnectorsSpec.scala
+++ 
b/jakartams/src/test/scala/org/apache/pekko/stream/connectors/jakartams/scaladsl/JmsAckConnectorsSpec.scala
@@ -15,11 +15,11 @@ package 
org.apache.pekko.stream.connectors.jakartams.scaladsl
 
 import jakarta.jms.{ JMSException, TextMessage }
 import org.apache.pekko
-import org.apache.pekko.Done
-import org.apache.pekko.stream.connectors.jakartams._
-import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
-import org.apache.pekko.stream.testkit.scaladsl.TestSink
-import org.apache.pekko.stream.{ KillSwitches, ThrottleMode }
+import pekko.Done
+import pekko.stream.connectors.jakartams._
+import pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.stream.{ KillSwitches, ThrottleMode }
 import org.scalatest.Inspectors._
 import org.scalatest.time.Span.convertSpanToDuration
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


Reply via email to