This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch file-elastic in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors-samples.git
commit 4d4b80cc093615e447a41002befdcb05e0e4d8e6 Author: PJ Fanning <[email protected]> AuthorDate: Sat Dec 16 22:57:55 2023 +0100 migrate file to elasticsearch --- docs/build.sbt | 112 ++++++++++----------- docs/project/Dependencies.scala | 26 ++--- docs/src/main/paradox/index.md | 4 +- .../README.md | 10 +- .../build.sbt | 2 +- .../docs/src/main/paradox/index.md | 4 +- .../project/Dependencies.scala | 22 ++-- .../src/main/java/samples/javadsl/Main.java | 32 +++--- .../src/main/resources/logback.xml | 2 +- .../src/main/scala/samples/javadsl/RunOps.scala | 5 +- .../src/main/scala/samples/scaladsl/Main.scala | 22 ++-- .../src/main/scala/samples/scaladsl/RunOps.scala | 8 +- pekko-connectors-sample-ftp-to-file/README.md | 4 +- pekko-connectors-sample-ftp-to-file/build.sbt | 2 +- .../project/Dependencies.scala | 16 +-- .../README.md | 4 +- .../project/CommonSettings.scala | 2 +- .../project/Dependencies.scala | 12 +-- .../project/CommonSettings.scala | 2 +- pekko-connectors-sample-jms/build.sbt | 2 +- .../README.md | 4 +- .../build.sbt | 2 +- .../project/Dependencies.scala | 14 +-- .../README.md | 4 +- .../build.sbt | 2 +- .../project/Dependencies.scala | 8 +- .../build.sbt | 10 +- pekko-connectors-sample-mqtt-to-kafka/README.md | 4 +- pekko-connectors-sample-mqtt-to-kafka/build.sbt | 2 +- .../project/Dependencies.scala | 14 +-- .../README.md | 4 +- .../build.sbt | 2 +- .../project/Dependencies.scala | 16 +-- 33 files changed, 191 insertions(+), 188 deletions(-) diff --git a/docs/build.sbt b/docs/build.sbt index aad702c..c7446e1 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -25,14 +25,14 @@ FtpToFile / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${FtpToFile.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${FtpToFile.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.FtpToFile.AlpakkaVersion}";, + // Pekko Connectors + "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.FtpToFile.PekkoConnectorsVersion}";, "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.FtpToFile.AlpakkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.FtpToFile.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.FtpToFile.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.FtpToFile.AkkaVersion}/%s";, + "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.FtpToFile.PekkoConnectorsVersion}/%s";, + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.FtpToFile.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.FtpToFile.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.FtpToFile.PekkoVersion}/%s";, ) FtpToFile / paradoxGroups := Map("Language" -> Seq("Java", "Scala")) @@ -47,19 +47,19 @@ HttpCsvToKafka / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${HttpCsvToKafka.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${HttpCsvToKafka.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.HttpCsvToKafka.AlpakkaVersion}";, + // Pekko Connectors + "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.HttpCsvToKafka.PekkoConnectorsVersion}";, "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.HttpCsvToKafka.AlpakkaVersion}/%s";, - // Alpakka Kafka + "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.HttpCsvToKafka.PekkoConnectorsVersion}/%s";, + // Pekko Connectors Kafka "scaladoc.akka.kafka.base_url" -> s"https://doc.akka.io/api/alpakka-kafka/${Dependencies.HttpCsvToKafka.AlpakkaKafkaVersion}";, "javadoc.akka.kafka.base_url" -> "", "extref.alpakka-kafka.base_url" -> s"https://doc.akka.io/docs/alpakka-kafka/${Dependencies.HttpCsvToKafka.AlpakkaKafkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.HttpCsvToKafka.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.HttpCsvToKafka.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.HttpCsvToKafka.AkkaVersion}/%s";, - // Akka HTTP + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.HttpCsvToKafka.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.HttpCsvToKafka.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.HttpCsvToKafka.PekkoVersion}/%s";, + // Pekko HTTP "scaladoc.akka.http.base_url" -> s"https://doc.akka.io/api/akka-http/${Dependencies.HttpCsvToKafka.AkkaHttpVersion}";, "javadoc.akka.http.base_url" -> s"https://doc.akka.io/japi/akka-http/${Dependencies.HttpCsvToKafka.AkkaHttpVersion}";, "extref.akka-http.base_url" -> s"https://doc.akka.io/docs/akka-http/${Dependencies.HttpCsvToKafka.AkkaHttpVersion}/%s";, @@ -125,18 +125,18 @@ KafkaToElasticsearch / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${KafkaToElasticsearch.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${KafkaToElasticsearch.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.KafkaToElasticsearch.AlpakkaVersion}";, + // Pekko Connectors + "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.KafkaToElasticsearch.PekkoConnectorsVersion}";, "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.KafkaToElasticsearch.AlpakkaVersion}/%s";, - // Alpakka Kafka + "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.KafkaToElasticsearch.PekkoConnectorsVersion}/%s";, + // Pekko Connectors Kafka "scaladoc.akka.kafka.base_url" -> s"https://doc.akka.io/api/alpakka-kafka/${Dependencies.KafkaToElasticsearch.AlpakkaKafkaVersion}";, "javadoc.akka.kafka.base_url" -> "", "extref.alpakka-kafka.base_url" -> s"https://doc.akka.io/docs/alpakka-kafka/${Dependencies.KafkaToElasticsearch.AlpakkaKafkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.KafkaToElasticsearch.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.KafkaToElasticsearch.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.KafkaToElasticsearch.AkkaVersion}/%s";, + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.KafkaToElasticsearch.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.KafkaToElasticsearch.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.KafkaToElasticsearch.PekkoVersion}/%s";, ) KafkaToElasticsearch / paradoxGroups := Map("Language" -> Seq("Java", "Scala")) @@ -151,19 +151,19 @@ KafkaToWebsocketClients / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${KafkaToWebsocketClients.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${KafkaToWebsocketClients.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka -// "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.KafkaToWebsocketClients.AlpakkaVersion}";, + // Pekko Connectors +// "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.KafkaToWebsocketClients.PekkoConnectorsVersion}";, // "javadoc.akka.base_url" -> "", -// "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.KafkaToWebsocketClients.AlpakkaVersion}/%s";, - // Alpakka Kafka +// "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.KafkaToWebsocketClients.PekkoConnectorsVersion}/%s";, + // Pekko Connectors Kafka "scaladoc.akka.kafka.base_url" -> s"https://doc.akka.io/api/alpakka-kafka/${Dependencies.KafkaToWebsocketClients.AlpakkaKafkaVersion}";, "javadoc.akka.kafka.base_url" -> "", "extref.alpakka-kafka.base_url" -> s"https://doc.akka.io/docs/alpakka-kafka/${Dependencies.KafkaToWebsocketClients.AlpakkaKafkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.KafkaToWebsocketClients.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.KafkaToWebsocketClients.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.KafkaToWebsocketClients.AkkaVersion}/%s";, - // Akka HTTP + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.KafkaToWebsocketClients.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.KafkaToWebsocketClients.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.KafkaToWebsocketClients.PekkoVersion}/%s";, + // Pekko HTTP "scaladoc.akka.http.base_url" -> s"https://doc.akka.io/api/akka-http/${Dependencies.KafkaToWebsocketClients.AkkaHttpVersion}";, "javadoc.akka.http.base_url" -> s"https://doc.akka.io/japi/akka-http/${Dependencies.KafkaToWebsocketClients.AkkaHttpVersion}";, "extref.akka-http.base_url" -> s"https://doc.akka.io/docs/akka-http/${Dependencies.KafkaToWebsocketClients.AkkaHttpVersion}/%s";, @@ -181,18 +181,18 @@ MqttToKafka / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${MqttToKafka.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${MqttToKafka.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.MqttToKafka.AlpakkaVersion}";, + // Pekko Connectors + "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.MqttToKafka.PekkoConnectorsVersion}";, "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.MqttToKafka.AlpakkaVersion}/%s";, - // Alpakka Kafka + "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.MqttToKafka.PekkoConnectorsVersion}/%s";, + // Pekko Connectors Kafka "scaladoc.akka.kafka.base_url" -> s"https://doc.akka.io/api/alpakka-kafka/${Dependencies.MqttToKafka.AlpakkaKafkaVersion}";, "javadoc.akka.kafka.base_url" -> "", "extref.alpakka-kafka.base_url" -> s"https://doc.akka.io/docs/alpakka-kafka/${Dependencies.MqttToKafka.AlpakkaKafkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.MqttToKafka.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.MqttToKafka.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.MqttToKafka.AkkaVersion}/%s";, + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.MqttToKafka.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.MqttToKafka.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.MqttToKafka.PekkoVersion}/%s";, ) MqttToKafka / paradoxGroups := Map("Language" -> Seq("Java", "Scala")) @@ -208,14 +208,14 @@ FileToElasticsearch / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${FileToElasticsearch.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${FileToElasticsearch.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.FileToElasticsearch.AlpakkaVersion}";, - "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.FileToElasticsearch.AlpakkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.FileToElasticsearch.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.FileToElasticsearch.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.FileToElasticsearch.AkkaVersion}/%s";, + // Pekko Connectors + "scaladoc.org.apache.pekko.stream.connectors.base_url" -> s"https://pekko.apache.org/api/pekko-connectors/${Dependencies.FileToElasticsearch.PekkoConnectorsVersion}";, + "javadoc.org.apache.pekko.stream.connectors.base_url" -> "", + "extref.org.apache.pekko.stream.connectors.base_url" -> s"https://pekko.apache.org/docs/pekko-connectors/${Dependencies.FileToElasticsearch.PekkoConnectorsVersion}/%s";, + // Pekko + "scaladoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${Dependencies.FileToElasticsearch.PekkoVersion}";, + "javadoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/japi/pekko/${Dependencies.FileToElasticsearch.PekkoVersion}";, + "extref.org.apache.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/${Dependencies.FileToElasticsearch.PekkoVersion}/%s";, ) FileToElasticsearch / paradoxGroups := Map("Language" -> Seq("Java", "Scala")) @@ -230,14 +230,14 @@ RotateLogsToFtp / paradoxProperties ++= Map( "canonical.base_url" -> s"${homepage.value.get}/${RotateLogsToFtp.name}", "snip.build.base_dir" -> s"${baseDirectory.value}/../pekko-connectors-sample-${RotateLogsToFtp.name}", "github.root.base_dir" -> s"${baseDirectory.value}/..", - // Alpakka - "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.RotateLogsToFtp.AlpakkaVersion}";, + // Pekko Connectors + "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.RotateLogsToFtp.PekkoConnectorsVersion}";, "javadoc.akka.base_url" -> "", - "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.RotateLogsToFtp.AlpakkaVersion}/%s";, - // Akka - "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.RotateLogsToFtp.AkkaVersion}";, - "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.RotateLogsToFtp.AkkaVersion}";, - "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.RotateLogsToFtp.AkkaVersion}/%s";, + "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.RotateLogsToFtp.PekkoConnectorsVersion}/%s";, + // Pekko + "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.RotateLogsToFtp.PekkoVersion}";, + "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.RotateLogsToFtp.PekkoVersion}";, + "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.RotateLogsToFtp.PekkoVersion}/%s";, ) RotateLogsToFtp / paradoxGroups := Map("Language" -> Seq("Java", "Scala")) diff --git a/docs/project/Dependencies.scala b/docs/project/Dependencies.scala index 05b2b4e..2fcd09b 100644 --- a/docs/project/Dependencies.scala +++ b/docs/project/Dependencies.scala @@ -13,8 +13,8 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoVersion = versions("PekkoVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") } object HttpCsvToKafka { @@ -28,9 +28,9 @@ object Dependencies { val ScalaVersion = versions("scalaVer") val ScalaTestVersion = versions("ScalaTestVersion") - val AkkaVersion = versions("AkkaVersion") + val PekkoVersion = versions("PekkoVersion") val AkkaHttpVersion = versions("AkkaHttpVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") val AlpakkaKafkaVersion = versions("AlpakkaKafkaVersion") } @@ -73,8 +73,8 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoVersion = versions("PekkoVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") val AlpakkaKafkaVersion = versions("AlpakkaKafkaVersion") } @@ -88,7 +88,7 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") + val PekkoVersion = versions("PekkoVersion") val AkkaHttpVersion = versions("AkkaHttpVersion") val AlpakkaKafkaVersion = versions("AlpakkaKafkaVersion") } @@ -103,8 +103,8 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoVersion = versions("PekkoVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") val AlpakkaKafkaVersion = versions("AlpakkaKafkaVersion") } @@ -118,8 +118,8 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoVersion = versions("PekkoVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") } object RotateLogsToFtp { @@ -132,8 +132,8 @@ object Dependencies { } val ScalaVersion = versions("scalaVer") - val AkkaVersion = versions("AkkaVersion") - val AlpakkaVersion = versions("AlpakkaVersion") + val PekkoVersion = versions("PekkoVersion") + val PekkoConnectorsVersion = versions("PekkoConnectorsVersion") } } diff --git a/docs/src/main/paradox/index.md b/docs/src/main/paradox/index.md index 6b03508..c410318 100644 --- a/docs/src/main/paradox/index.md +++ b/docs/src/main/paradox/index.md @@ -27,9 +27,9 @@ Read a stream of data and store it zipped in rotating files on an SFTP server. ### @extref:[Subscribe to MQTT and produce to Kafka](mqtt-to-kafka:index.html) Subscribe to an MQTT topic with @extref[Pekko Connectors MQTT](pekko-connectors:/mqtt.html), group a few values and publish the aggregate to a Kafka topic with @extref[Pekko Connectors Kafka](alpakka-kafka:). -### @link:[Amazon SQS](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-sqs-java) { open=new } +### @link:[Amazon SQS](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-sqs-java) { open=new } Listen to an Amazon SQS topic, enrich the message via calling an actor, publish a new message to SQS and acknowledge/delete the original message. (Java only) -### @link:[MQTT topic triggers file download which is uploaded to AWS S3](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-mqtt-http-to-s3-java) { open=new } +### @link:[MQTT topic triggers file download which is uploaded to AWS S3](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-mqtt-http-to-s3-java) { open=new } Listen to a MQTT topic, download from the URL passed in the received message, and upload the data from that address to AWS S3. (Java only) diff --git a/pekko-connectors-sample-file-to-elasticsearch/README.md b/pekko-connectors-sample-file-to-elasticsearch/README.md index b888df3..5410016 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/README.md +++ b/pekko-connectors-sample-file-to-elasticsearch/README.md @@ -1,7 +1,7 @@ # Tail files added to a directory and publish to Elasticsearch This sample is a simplified implementation of a log file to Elasticsearch utility @link:[`logstash`](https://www.elastic.co/products/logstash). -The application will use @extref[Alpakka File](alpakka:file.html) to watch a directory for new file creation events and then tail the files for their contents. +The application will use @extref[Pekko Connectors File](pekko-connectors:file.html) to watch a directory for new file creation events and then tail the files for their contents. The log file is tailed until it is deleted or the stream is complete. Lines from the log file have their date parsed based on several compatible date time formats (ISO 8601 Zoned and Local datetime timestamps). A record is created that is comprised of the following fields. @@ -13,9 +13,9 @@ A record is created that is comprised of the following fields. 5. Line number Each log line record is indexed in an Elasticsearch index called `logs`. -The application will use @extref[Alpakka Elasticsearch](alpakka:elasticsearch.html) to index log lines into Elasticsearch and query them from the index once the stream is complete. +The application will use @extref[Pekko Connectors Elasticsearch](pekko-connectors:elasticsearch.html) to index log lines into Elasticsearch and query them from the index once the stream is complete. -When the stream completes, @extref[Alpakka Elasticsearch](alpakka:elasticsearch.html) is used to query all log lines that were indexed and log them. +When the stream completes, @extref[Pekko Connectors Elasticsearch](pekko-connectors:elasticsearch.html) is used to query all log lines that were indexed and log them. A summary of tailed log files is also logged, which includes the following fields. 1. Directory @@ -24,6 +24,6 @@ A summary of tailed log files is also logged, which includes the following field 4. Last updated timestamp 5. Total log lines parsed -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-file-to-elasticsearch) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-file-to-elasticsearch) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-file-to-elasticsearch` directory. \ No newline at end of file +To try out this project clone @link:[the Pekko Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `pekko-connectors-sample-file-to-elasticsearch` directory. \ No newline at end of file diff --git a/pekko-connectors-sample-file-to-elasticsearch/build.sbt b/pekko-connectors-sample-file-to-elasticsearch/build.sbt index 2137528..480228d 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/build.sbt +++ b/pekko-connectors-sample-file-to-elasticsearch/build.sbt @@ -2,6 +2,6 @@ import sbt.Keys._ name := "pekko-connectors-sample-file-to-elasticsearch" organization := "samples" -version := "1.3.0" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies \ No newline at end of file diff --git a/pekko-connectors-sample-file-to-elasticsearch/docs/src/main/paradox/index.md b/pekko-connectors-sample-file-to-elasticsearch/docs/src/main/paradox/index.md index 195a48d..f94b9f1 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/docs/src/main/paradox/index.md +++ b/pekko-connectors-sample-file-to-elasticsearch/docs/src/main/paradox/index.md @@ -18,9 +18,9 @@ Dependencies (sbt notation) - Extract the date timestamp from the log line (9) - Create a `LogLine` record (10) - Create an ES index wrapper message for `LogLine` (11) -- Use Alpakka Elasticsearch to create a new `LogLine` record. (12) +- Use Pekko Connectors Elasticsearch to create a new `LogLine` record. (12) - Track statistics per log file (13) -- Use Alpakka Elasticsearch to return all entries from the provided index (14) +- Use Pekko Connectors Elasticsearch to return all entries from the provided index (14) - Compose stream together starting with the `DirectoryChangesSource` (15) - Run the graph and capture the materialized values (16) - Run a new graph to query all records from Elasticsearch and get the results (17) diff --git a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala index 7caee54..a4d6a97 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala @@ -3,23 +3,25 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" - val AlpakkaVersion = "4.0.0" + val PekkoVersion = "1.0.2" + val PekkoConnectorsVersion = "1.0.1" + val jacksonVersion = "2.14.3" // #deps val dependencies = List( // #deps - "com.lightbend.akka" %% "akka-stream-alpakka-file" % AlpakkaVersion, - "com.lightbend.akka" %% "akka-stream-alpakka-elasticsearch" % AlpakkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, + "org.apache.pekko" %% "pekko-connectors-file" % PekkoConnectorsVersion, + "org.apache.pekko" %% "pekko-connectors-elasticsearch" % PekkoConnectorsVersion, + "org.apache.pekko" %% "pekko-stream" % PekkoVersion, + "org.apache.pekko" %% "pekko-actor-typed" % PekkoVersion, + "org.apache.pekko" %% "pekko-actor" % PekkoVersion, + "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2", // for JSON in Scala "io.spray" %% "spray-json" % "1.3.6", // for JSON in Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.13.4", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion, + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion, // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13", // #deps "org.testcontainers" % "elasticsearch" % "1.17.3" diff --git a/pekko-connectors-sample-file-to-elasticsearch/src/main/java/samples/javadsl/Main.java b/pekko-connectors-sample-file-to-elasticsearch/src/main/java/samples/javadsl/Main.java index f268748..909114c 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/src/main/java/samples/javadsl/Main.java +++ b/pekko-connectors-sample-file-to-elasticsearch/src/main/java/samples/javadsl/Main.java @@ -1,19 +1,19 @@ package samples.javadsl; -import akka.Done; -import akka.NotUsed; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.javadsl.Behaviors; -import akka.japi.Pair; -import akka.stream.KillSwitches; -import akka.stream.UniqueKillSwitch; -import akka.stream.alpakka.elasticsearch.*; -import akka.stream.alpakka.elasticsearch.javadsl.ElasticsearchFlow; -import akka.stream.alpakka.elasticsearch.javadsl.ElasticsearchSource; -import akka.stream.alpakka.file.DirectoryChange; -import akka.stream.alpakka.file.javadsl.DirectoryChangesSource; -import akka.stream.alpakka.file.javadsl.FileTailSource; -import akka.stream.javadsl.*; +import org.apache.pekko.Done; +import org.apache.pekko.NotUsed; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.japi.Pair; +import org.apache.pekko.stream.KillSwitches; +import org.apache.pekko.stream.UniqueKillSwitch; +import org.apache.pekko.stream.connectors.elasticsearch.*; +import org.apache.pekko.stream.connectors.elasticsearch.javadsl.ElasticsearchFlow; +import org.apache.pekko.stream.connectors.elasticsearch.javadsl.ElasticsearchSource; +import org.apache.pekko.stream.connectors.file.DirectoryChange; +import org.apache.pekko.stream.connectors.file.javadsl.DirectoryChangesSource; +import org.apache.pekko.stream.connectors.file.javadsl.FileTailSource; +import org.apache.pekko.stream.javadsl.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import samples.common.DateTimeExtractor; @@ -110,7 +110,7 @@ public class Main { return Flow.<LogLine>create() // create an ES index wrapper message for `LogLine` (11) .map(WriteMessage::createIndexMessage) - // use Alpakka Elasticsearch to create a new `LogLine` record. (12) + // use Pekko Connectors Elasticsearch to create a new `LogLine` record. (12) // takes `ObjectMapper` for `LogLine` for serialization .via(ElasticsearchFlow.create( ElasticsearchParams.V5(indexName, typeName), @@ -155,7 +155,7 @@ public class Main { private CompletionStage<List<LogLine>> queryAllRecordsFromElasticsearch(String indexName) { CompletionStage<List<LogLine>> reading = - // use Alpakka Elasticsearch to return all entries from the provided index (14) + // use Pekko Connectors Elasticsearch to return all entries from the provided index (14) ElasticsearchSource .typed( ElasticsearchParams.V5(indexName, typeName), diff --git a/pekko-connectors-sample-file-to-elasticsearch/src/main/resources/logback.xml b/pekko-connectors-sample-file-to-elasticsearch/src/main/resources/logback.xml index 357e8a1..e43cc67 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/src/main/resources/logback.xml +++ b/pekko-connectors-sample-file-to-elasticsearch/src/main/resources/logback.xml @@ -7,7 +7,7 @@ </encoder> </appender> - <logger name="akka" level="WARN"/> + <logger name="org.apache.pekko" level="WARN"/> <logger name="com.github.dockerjava" level="INFO"/> <logger name="org.testcontainers" level="INFO"/> diff --git a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/javadsl/RunOps.scala b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/javadsl/RunOps.scala index 12596f8..27b6b2c 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/javadsl/RunOps.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/javadsl/RunOps.scala @@ -1,9 +1,10 @@ package samples.javadsl + import java.nio.file.Path import java.util.concurrent.CompletionStage -import akka.Done -import akka.actor.typed.ActorSystem +import org.apache.pekko.Done +import org.apache.pekko.actor.typed.ActorSystem import samples.scaladsl import scala.compat.java8.FutureConverters._ diff --git a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/Main.scala b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/Main.scala index 5e1bf3e..7bad13b 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/Main.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/Main.scala @@ -5,15 +5,15 @@ package samples.scaladsl import java.nio.file._ -import akka.NotUsed -import akka.actor.typed.ActorSystem -import akka.actor.typed.scaladsl.Behaviors -import akka.stream.alpakka.elasticsearch._ -import akka.stream.alpakka.elasticsearch.scaladsl.{ElasticsearchFlow, ElasticsearchSource} -import akka.stream.alpakka.file.DirectoryChange -import akka.stream.alpakka.file.scaladsl.{DirectoryChangesSource, FileTailSource} -import akka.stream.scaladsl.{Flow, Keep, RunnableGraph, Sink, Source} -import akka.stream.{KillSwitches, Materializer, UniqueKillSwitch} +import org.apache.pekko.NotUsed +import org.apache.pekko.actor.typed.ActorSystem +import org.apache.pekko.actor.typed.scaladsl.Behaviors +import org.apache.pekko.stream.connectors.elasticsearch._ +import org.apache.pekko.stream.connectors.elasticsearch.scaladsl.{ElasticsearchFlow, ElasticsearchSource} +import org.apache.pekko.stream.connectors.file.DirectoryChange +import org.apache.pekko.stream.connectors.file.scaladsl.{DirectoryChangesSource, FileTailSource} +import org.apache.pekko.stream.scaladsl.{Flow, Keep, RunnableGraph, Sink, Source} +import org.apache.pekko.stream.{KillSwitches, Materializer, UniqueKillSwitch} import samples.common.DateTimeExtractor import samples.scaladsl.LogFileSummary.LogFileSummaries @@ -96,7 +96,7 @@ object Main extends App { Flow[LogLine] // create an ES index wrapper message for `LogLine` (11) .map(WriteMessage.createIndexMessage[LogLine]) - // use Alpakka Elasticsearch to create a new `LogLine` record. (12) + // use Pekko Connectors Elasticsearch to create a new `LogLine` record. (12) // implicitly takes `JsonFormat` for `LogLine` for serialization .via(ElasticsearchFlow.create(ElasticsearchParams.V5(indexName, typeName), ElasticsearchWriteSettings.create(connectionSettings).withApiVersion(ApiVersion.V5))) @@ -130,7 +130,7 @@ object Main extends App { def queryAllRecordsFromElasticsearch(indexName: String): Future[immutable.Seq[LogLine]] = { val reading = ElasticsearchSource - // use Alpakka Elasticsearch to return all entries from the provided index (14) + // use Pekko Connectors Elasticsearch to return all entries from the provided index (14) .typed[LogLine](ElasticsearchParams.V5(indexName, typeName), """{"match_all": {}}""", ElasticsearchSourceSettings.create(connectionSettings).withApiVersion(ApiVersion.V5)) .map(_.source) diff --git a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/RunOps.scala b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/RunOps.scala index e6d1d94..1c67c84 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/RunOps.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/src/main/scala/samples/scaladsl/RunOps.scala @@ -2,10 +2,10 @@ package samples.scaladsl import java.nio.file.{Files, Path, Paths, StandardCopyOption} import java.time.ZonedDateTime -import akka.Done -import akka.actor.typed.ActorSystem -import akka.stream.alpakka.file.scaladsl.Directory -import akka.stream.scaladsl.{Keep, Sink} +import org.apache.pekko.Done +import org.apache.pekko.actor.typed.ActorSystem +import org.apache.pekko.stream.connectors.file.scaladsl.Directory +import org.apache.pekko.stream.scaladsl.{Keep, Sink} import org.slf4j.LoggerFactory import org.testcontainers.elasticsearch.ElasticsearchContainer diff --git a/pekko-connectors-sample-ftp-to-file/README.md b/pekko-connectors-sample-ftp-to-file/README.md index 4da3e55..3b6cf69 100644 --- a/pekko-connectors-sample-ftp-to-file/README.md +++ b/pekko-connectors-sample-ftp-to-file/README.md @@ -4,6 +4,6 @@ This example uses @extref[Alpakka FTP](alpakka:ftp.html) to read from the FTP server, and stores files using Akka Stream `FileIO`. -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-ftp-to-file) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-ftp-to-file) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-ftp-to-file` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-ftp-to-file` directory. diff --git a/pekko-connectors-sample-ftp-to-file/build.sbt b/pekko-connectors-sample-ftp-to-file/build.sbt index 780bfff..0b112ab 100644 --- a/pekko-connectors-sample-ftp-to-file/build.sbt +++ b/pekko-connectors-sample-ftp-to-file/build.sbt @@ -1,5 +1,5 @@ organization := "com.lightbend.akka.samples" name := "pekko-connectors-sample-ftp-to-file" -version := "0.0.1" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies diff --git a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala index 7e564da..2180918 100644 --- a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala +++ b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala @@ -3,25 +3,25 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" - val AlpakkaVersion = "4.0.0" + val PekkoVersion = "2.6.19" + val PekkoConnectorsVersion = "4.0.0" // #deps val dependencies = List( // #deps - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.lightbend.akka" %% "akka-stream-alpakka-ftp" % AlpakkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-ftp" % PekkoConnectorsVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor" % PekkoVersion, // #deps // Playground file system and FTP server // https://mina.apache.org/ftpserver-project/downloads.html "org.apache.ftpserver" % "ftpserver-core" % "1.1.1", // ApacheV2 "com.google.jimfs" % "jimfs" % "1.1", // ApacheV2 // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13" ) } diff --git a/pekko-connectors-sample-http-csv-to-kafka/README.md b/pekko-connectors-sample-http-csv-to-kafka/README.md index 218db37..98094dd 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/README.md +++ b/pekko-connectors-sample-http-csv-to-kafka/README.md @@ -4,6 +4,6 @@ This example uses @extref[Akka HTTP to send the HTTP request](akka-http:client-side/connection-level.html#opening-http-connections) and Akka HTTPs primary JSON support via @extref[Spray JSON](akka-http:common/json-support.html#spray-json-support) (for Scala) or Jackson JSON (for Java) to convert the map into a JSON structure which gets published to a Kafka topic. -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-http-csv-to-kafka) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-http-csv-to-kafka) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-http-csv-to-kafka` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-http-csv-to-kafka` directory. diff --git a/pekko-connectors-sample-http-csv-to-kafka/project/CommonSettings.scala b/pekko-connectors-sample-http-csv-to-kafka/project/CommonSettings.scala index ddcaaf5..8e27590 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/CommonSettings.scala +++ b/pekko-connectors-sample-http-csv-to-kafka/project/CommonSettings.scala @@ -5,7 +5,7 @@ import sbtstudent.AdditionalSettings object CommonSettings { lazy val commonSettings = Seq( organization := "com.lightbend.training", - version := "1.3.0", + version := "1.0.0", scalaVersion := Dependencies.scalaVer, scalacOptions ++= CompileOptions.compileOptions, Compile / unmanagedSourceDirectories := List((Compile / scalaSource).value, (Compile / javaSource).value), diff --git a/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala b/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala index 66be97a..cc5be29 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala @@ -4,16 +4,16 @@ object Dependencies { val scalaVer = "2.13.12" // #dependencies val ScalaTestVersion = "3.1.4" - val AkkaVersion = "2.6.19" + val PekkoVersion = "2.6.19" val AkkaHttpVersion = "10.1.12" - val AlpakkaVersion = "4.0.0" + val PekkoConnectorsVersion = "4.0.0" val AlpakkaKafkaVersion = "3.0.1" val dependencies = List( - "com.lightbend.akka" %% "akka-stream-alpakka-csv" % AlpakkaVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-csv" % PekkoConnectorsVersion, "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion, // Used from Scala "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion, @@ -23,7 +23,7 @@ object Dependencies { "org.testcontainers" % "kafka" % "1.14.3", - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13" ) // #dependencies diff --git a/pekko-connectors-sample-jdbc-to-elasticsearch/project/CommonSettings.scala b/pekko-connectors-sample-jdbc-to-elasticsearch/project/CommonSettings.scala index fba2144..40e7e34 100644 --- a/pekko-connectors-sample-jdbc-to-elasticsearch/project/CommonSettings.scala +++ b/pekko-connectors-sample-jdbc-to-elasticsearch/project/CommonSettings.scala @@ -4,7 +4,7 @@ import sbt._ object CommonSettings { lazy val commonSettings = Seq( organization := "org.apache.pekko", - version := "1.0.1", + version := "1.0.0", scalaVersion := Dependencies.scalaVer, scalacOptions ++= CompileOptions.compileOptions, Compile / unmanagedSourceDirectories := List((Compile / scalaSource).value, (Compile / javaSource).value), diff --git a/pekko-connectors-sample-jms/build.sbt b/pekko-connectors-sample-jms/build.sbt index be69f1a..57f3c01 100644 --- a/pekko-connectors-sample-jms/build.sbt +++ b/pekko-connectors-sample-jms/build.sbt @@ -1,5 +1,5 @@ organization := "org.apache.pekko" -version := "1.0.1" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies // Having JBoss as a first resolver is a workaround for https://github.com/coursier/coursier/issues/200 diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/README.md b/pekko-connectors-sample-kafka-to-elasticsearch/README.md index 2ad3575..1c4b93e 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/README.md +++ b/pekko-connectors-sample-kafka-to-elasticsearch/README.md @@ -4,6 +4,6 @@ This example uses @extref[Alpakka Kafka](alpakka-kafka:) to subscribe to a Kafka topic, parses JSON into a data class and stores the object in Elasticsearch. After storing the Kafka offset is committed back to Kafka. This gives at-least-once semantics. -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-kafka-to-elasticsearch) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-kafka-to-elasticsearch) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-kafka-to-elasticsearch` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-kafka-to-elasticsearch` directory. diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/build.sbt b/pekko-connectors-sample-kafka-to-elasticsearch/build.sbt index 90f37b4..d5eb377 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/build.sbt +++ b/pekko-connectors-sample-kafka-to-elasticsearch/build.sbt @@ -1,4 +1,4 @@ organization := "com.lightbend.akka" -version := "1.3.0" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala index 28330c3..09d310f 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala @@ -3,26 +3,26 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" - val AlpakkaVersion = "4.0.0" + val PekkoVersion = "2.6.19" + val PekkoConnectorsVersion = "4.0.0" val AlpakkaKafkaVersion = "3.0.1" // #deps val dependencies = List( // #deps - "com.lightbend.akka" %% "akka-stream-alpakka-elasticsearch" % AlpakkaVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-elasticsearch" % PekkoConnectorsVersion, "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor" % PekkoVersion, // for JSON in Scala "io.spray" %% "spray-json" % "1.3.6", // for JSON in Java "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.13.3", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.3", // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13", // #deps "org.testcontainers" % "elasticsearch" % "1.17.3", diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/README.md b/pekko-connectors-sample-kafka-to-websocket-clients/README.md index b3dd89c..7d0eb55 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/README.md +++ b/pekko-connectors-sample-kafka-to-websocket-clients/README.md @@ -4,9 +4,9 @@ Clients may connect via websockets and will receive data read from a Kafka topic. The websockets are implemented in @extref[Akka HTTP](akka-http:) and [Alpakka Kafka](alpakka-kafka:) subscribes to the Kafka topic. -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-kafka-to-websocket-clients) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-kafka-to-websocket-clients) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-kafka-to-websocket-clients` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-kafka-to-websocket-clients` directory. ## Running diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/build.sbt b/pekko-connectors-sample-kafka-to-websocket-clients/build.sbt index 82ce0fd..be14757 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/build.sbt +++ b/pekko-connectors-sample-kafka-to-websocket-clients/build.sbt @@ -2,7 +2,7 @@ import sbt.Keys._ name := "pekko-connectors-sample-kafka-to-websocket-clients" organization := "com.lightbend.akka" -version := "1.3.0" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala b/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala index 8fd58f4..2734d73 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala @@ -3,24 +3,24 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" + val PekkoVersion = "2.6.19" val AkkaHttpVersion = "10.1.12" val AlpakkaKafkaVersion = "3.0.1" // #deps val dependencies = List( // #deps - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion, "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13", // #deps "org.testcontainers" % "kafka" % "1.14.3", - "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test, + "com.typesafe.akka" %% "akka-stream-testkit" % PekkoVersion % Test, "com.google.guava" % "guava" % "28.2-jre" % Test, "junit" % "junit" % "4.13" % Test, diff --git a/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt b/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt index 04d83dc..e860ee7 100644 --- a/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt +++ b/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt @@ -3,14 +3,14 @@ name := "pekko-connectors-samples-mqtt-http-to-s3-java" ThisBuild / scalaVersion := "2.13.12" -val AkkaVersion = "2.6.19" +val PekkoVersion = "2.6.19" val AkkaHttpVersion = "10.1.12" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor" % PekkoVersion, "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion, "com.lightbend.akka" %% "akka-stream-alpakka-mqtt" % "3.0.4", "com.lightbend.akka" %% "akka-stream-alpakka-s3" % "3.0.4", diff --git a/pekko-connectors-sample-mqtt-to-kafka/README.md b/pekko-connectors-sample-mqtt-to-kafka/README.md index 615f311..e987e34 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/README.md +++ b/pekko-connectors-sample-mqtt-to-kafka/README.md @@ -4,6 +4,6 @@ Subscribe to an MQTT topic with @extref[Alpakka MQTT](alpakka:/mqtt.html), group a few values and publish the aggregate to a Kafka topic with @extref[Alpakka Kafka](alpakka-kafka:). -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-mqtt-to-kafka) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-mqtt-to-kafka) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-mqtt-to-kafka` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-mqtt-to-kafka` directory. diff --git a/pekko-connectors-sample-mqtt-to-kafka/build.sbt b/pekko-connectors-sample-mqtt-to-kafka/build.sbt index 90f37b4..d5eb377 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/build.sbt +++ b/pekko-connectors-sample-mqtt-to-kafka/build.sbt @@ -1,4 +1,4 @@ organization := "com.lightbend.akka" -version := "1.3.0" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies diff --git a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala index 9e2fbb4..746cd98 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala @@ -3,8 +3,8 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" - val AlpakkaVersion = "4.0.0" + val PekkoVersion = "2.6.19" + val PekkoConnectorsVersion = "4.0.0" val AlpakkaKafkaVersion = "3.0.1" val JacksonDatabindVersion = "2.11.4" @@ -12,18 +12,18 @@ object Dependencies { val dependencies = List( // #deps - "com.lightbend.akka" %% "akka-stream-alpakka-mqtt" % AlpakkaVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-mqtt" % PekkoConnectorsVersion, "com.typesafe.akka" %% "akka-stream-kafka" % AlpakkaKafkaVersion, - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor" % PekkoVersion, "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.4", // JSON "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % JacksonDatabindVersion, "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % JacksonDatabindVersion, "com.fasterxml.jackson.module" %% "jackson-module-scala" % JacksonDatabindVersion, // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13", // #deps "org.testcontainers" % "kafka" % "1.14.1" diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/README.md b/pekko-connectors-sample-rotate-logs-to-ftp/README.md index f2a9a05..fc0636e 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/README.md +++ b/pekko-connectors-sample-rotate-logs-to-ftp/README.md @@ -4,6 +4,6 @@ This example reads a stream of data and uses @extref[Alpakka File](alpakka:file.html) `LogRotatorSink` to write multiple files which get rotated triggered by a rotation function, the files are zipped in-flow and written to an SFTP server with @extref[Alpakka FTP](alpakka:ftp.html). -Browse the sources at @link:[Github](https://github.com/akka/alpakka-samples/tree/master/alpakka-sample-rotate-logs-to-ftp) { open=new }. +Browse the sources at @link:[Github](https://github.com/apache/incubator-pekko-connectors-samples/tree/main/pekko-connectors-sample-rotate-logs-to-ftp) { open=new }. -To try out this project clone @link:[the Alpakka Samples repository](https://github.com/akka/alpakka-samples) { open=new } and find it in the `alpakka-sample-rotate-logs-to-ftp` directory. +To try out this project clone @link:[the Pekko-Connectors Samples repository](https://github.com/apache/incubator-pekko-connectors-samples) { open=new } and find it in the `alpakka-sample-rotate-logs-to-ftp` directory. diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/build.sbt b/pekko-connectors-sample-rotate-logs-to-ftp/build.sbt index bcb3e49..2ef94f2 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/build.sbt +++ b/pekko-connectors-sample-rotate-logs-to-ftp/build.sbt @@ -1,6 +1,6 @@ organization := "com.lightbend.akka.samples" name := "pekko-connectors-sample-rotate-logs-to-ftp" -version := "0.0.1" +version := "1.0.0" scalaVersion := Dependencies.scalaVer libraryDependencies ++= Dependencies.dependencies javacOptions += "-Xlint:unchecked" diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala b/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala index cc4a53d..2829787 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala +++ b/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala @@ -3,18 +3,18 @@ import sbt._ object Dependencies { val scalaVer = "2.13.12" // #deps - val AkkaVersion = "2.6.19" - val AlpakkaVersion = "4.0.0" + val PekkoVersion = "2.6.19" + val PekkoConnectorsVersion = "4.0.0" // #deps val dependencies = List( // #deps - "com.typesafe.akka" %% "akka-stream" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion, - "com.typesafe.akka" %% "akka-actor" % AkkaVersion, - "com.lightbend.akka" %% "akka-stream-alpakka-file" % AlpakkaVersion, - "com.lightbend.akka" %% "akka-stream-alpakka-ftp" % AlpakkaVersion, + "com.typesafe.akka" %% "akka-stream" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor-typed" % PekkoVersion, + "com.typesafe.akka" %% "akka-actor" % PekkoVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-file" % PekkoConnectorsVersion, + "com.lightbend.akka" %% "akka-stream-alpakka-ftp" % PekkoConnectorsVersion, // #deps // Playground file system and FTP server // https://mina.apache.org/ftpserver-project/downloads.html @@ -23,7 +23,7 @@ object Dependencies { "org.apache.sshd" % "sshd-sftp" % "2.5.1", // ApacheV2 "com.google.jimfs" % "jimfs" % "1.1", // ApacheV2 // Logging - "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, + "com.typesafe.akka" %% "akka-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.2.13" ) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
