Bump version and fix minor issues

pbernet · Jan 17, 2025 · 7721d9d · 7721d9d
1 parent 9e47c12
commit 7721d9d
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ exactly this feeling by offering a collection of runnable examples.
 
 ### Prerequisites
 
-Java 17 or higher (recommended: [GraalVM JDK 21](https://www.graalvm.org/downloads))
+Java 17 or higher (recommended: [GraalVM](https://www.graalvm.org/downloads))
 
 ### Installation
 

diff --git a/build.sbt b/build.sbt
@@ -8,12 +8,12 @@ scalaVersion := "2.13.15"
 
 val pekkoVersion = "1.1.3"
 val pekkoHTTPVersion = "1.1.0"
-val pekkoConnectorVersion = "1.0.2"
+val pekkoConnectorVersion = "1.1.0"
 val pekkoConnectorKafkaVersion = "1.1.0"
 
 val kafkaVersion = "3.8.1"
 val activemqVersion = "5.18.5" // We are stuck with 5.x
-val artemisVersion = "2.37.0"
+val artemisVersion = "2.39.0"
 val testContainersVersion = "1.20.4"
 val keycloakVersion = "26.0.1"
 val sttpVersion = "3.10.1"
@@ -23,7 +23,7 @@ val gatlingVersion = "3.13.1"
 val circeVersion = "0.14.8"
 
 libraryDependencies ++= Seq(
-  "org.scala-lang.modules" %% "scala-parallel-collections" % "1.1.0",
+  "org.scala-lang.modules" %% "scala-parallel-collections" % "1.2.0",
 
   "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
   "org.apache.pekko" %% "pekko-stream-typed" % pekkoVersion,

diff --git a/src/main/scala/alpakka/dynamodb/DynamoDBEcho.scala b/src/main/scala/alpakka/dynamodb/DynamoDBEcho.scala
@@ -1,9 +1,10 @@
 package alpakka.dynamodb
 
 
-import com.github.pjfanning.pekkohttpspi.PekkoHttpClient
+
 import org.apache.pekko.NotUsed
 import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient
 import org.apache.pekko.stream.connectors.dynamodb.scaladsl.DynamoDb
 import org.apache.pekko.stream.scaladsl.{FlowWithContext, Sink, Source}
 import org.slf4j.LoggerFactory

diff --git a/src/main/scala/alpakka/env/JMSServerArtemis.scala b/src/main/scala/alpakka/env/JMSServerArtemis.scala
@@ -29,6 +29,10 @@ object JMSServerArtemis extends App {
   val port = 21616
   val serverUrl = s"tcp://$host:$port"
 
+  // Does not run with Java 23, this suggested workaround does not help
+  // Doc: https://issues.apache.org/jira/browse/ARTEMIS-4975
+  System.setProperty("java.security.manager", "allow")
+
   val securityConfig = new SecurityConfiguration()
   securityConfig.addUser("artemis", "artemis")
   securityConfig.addRole("artemis", "guest")

diff --git a/src/main/scala/alpakka/kinesis/FirehoseEcho.scala b/src/main/scala/alpakka/kinesis/FirehoseEcho.scala
@@ -1,9 +1,9 @@
 package alpakka.kinesis
 
-import com.github.pjfanning.pekkohttpspi.PekkoHttpClient
 import org.apache.pekko.NotUsed
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.stream.Attributes
+import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient
 import org.apache.pekko.stream.connectors.kinesisfirehose.scaladsl.KinesisFirehoseFlow
 import org.apache.pekko.stream.connectors.s3.AccessStyle.PathAccessStyle
 import org.apache.pekko.stream.connectors.s3.scaladsl.S3

diff --git a/src/main/scala/alpakka/kinesis/KinesisEcho.scala b/src/main/scala/alpakka/kinesis/KinesisEcho.scala
@@ -1,9 +1,10 @@
 package alpakka.kinesis
 
-import com.github.pjfanning.pekkohttpspi.PekkoHttpClient
+
 import org.apache.commons.validator.routines.UrlValidator
 import org.apache.pekko.NotUsed
 import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient
 import org.apache.pekko.stream.connectors.kinesis.scaladsl.{KinesisFlow, KinesisSource}
 import org.apache.pekko.stream.connectors.kinesis.{KinesisFlowSettings, ShardIterator, ShardSettings}
 import org.apache.pekko.stream.scaladsl.{Flow, Sink, Source}

diff --git a/src/main/scala/alpakka/sqs/SqsEcho.scala b/src/main/scala/alpakka/sqs/SqsEcho.scala
@@ -1,8 +1,8 @@
 package alpakka.sqs
 
-import com.github.pjfanning.pekkohttpspi.PekkoHttpClient
 import org.apache.commons.validator.routines.UrlValidator
 import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient
 import org.apache.pekko.stream.connectors.sqs.*
 import org.apache.pekko.stream.connectors.sqs.scaladsl.{SqsAckSink, SqsPublishSink, SqsSource}
 import org.apache.pekko.stream.scaladsl.{Flow, Sink, Source}

diff --git a/src/main/scala/sample/stream/PublishToSourceQueueFromMultipleThreads.scala b/src/main/scala/sample/stream/PublishToSourceQueueFromMultipleThreads.scala
@@ -36,7 +36,6 @@ object PublishToSourceQueueFromMultipleThreads extends App {
   import system.dispatcher
 
   val bufferSize = 100
-  // As of akka 2.6.x there is a thread safe implementation for SourceQueue
   val maxConcurrentOffers = 1000
   val numberOfPublishingClients = 1000
 

diff --git a/src/main/scala/sample/stream_shared_state/Dedupe.scala b/src/main/scala/sample/stream_shared_state/Dedupe.scala
@@ -10,7 +10,7 @@ import scala.util.{Failure, Success}
 
 /**
   * Drop identical (consecutive or non-consecutive) elements in an
-  * unbounded stream using the squbs `Deduplicate` GraphStage:
+  * unbounded stream using the (re-implemented) squbs `Deduplicate` GraphStage:
   * https://squbs.readthedocs.io/en/latest/deduplicate
   *
   * More general than: [[DeduplicateConsecutiveElements]]

diff --git a/src/main/scala/sample/stream_shared_state/LocalFileCacheCaffeine.scala b/src/main/scala/sample/stream_shared_state/LocalFileCacheCaffeine.scala
@@ -28,7 +28,7 @@ import scala.util.control.NonFatal
   *  - On downstream error: the path needs to be kept longer in the cache
   *  - On restart: populate cache from local filesystem
   *
-  * Before running this class: start [[alpakka.env.FileServer]] to simulate non idempotent responses
+  * Before running this class: start [[alpakka.env.FileServer]] to simulate non-idempotent responses
   * Monitor `localFileCache` dir with cmd:  watch ls -ltr
   *
   * Doc: