diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2f4dec3..3e4951a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,19 +12,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Java 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 11 - name: Install sbt - uses: sbt/setup-sbt@v1 + uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14 - name: Cache Coursier cache - uses: coursier/cache-action@v6 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 # 6.4.8 - name: "Create site with Paradox" run: cd docs && sbt makeSite diff --git a/docs/build.sbt b/docs/build.sbt index 300a696..2446762 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -1,5 +1,5 @@ -ThisBuild / scalaVersion := "2.13.16" +ThisBuild / scalaVersion := "2.13.17" enablePlugins(ParadoxPlugin, PekkoParadoxPlugin, ParadoxSitePlugin) diff --git a/docs/project/build.properties b/docs/project/build.properties index 73df629..01a16ed 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala index 8436218..514d859 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-file-to-elasticsearch/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoConnectorsVersion = "1.1.0" - val jacksonVersion = "2.17.3" + val PekkoVersion = "1.2.1" + val PekkoConnectorsVersion = "1.2.0" + val jacksonVersion = "2.20.0" // #deps val dependencies = List( // #deps diff --git a/pekko-connectors-sample-file-to-elasticsearch/project/build.properties b/pekko-connectors-sample-file-to-elasticsearch/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-file-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-file-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala index aa1b209..cc91b7b 100644 --- a/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala +++ b/pekko-connectors-sample-ftp-to-file/project/Dependencies.scala @@ -1,10 +1,10 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoConnectorsVersion = "1.2.0" // #deps diff --git a/pekko-connectors-sample-ftp-to-file/project/build.properties b/pekko-connectors-sample-ftp-to-file/project/build.properties index 8fc2987..b1b1040 100644 --- a/pekko-connectors-sample-ftp-to-file/project/build.properties +++ b/pekko-connectors-sample-ftp-to-file/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 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 df503f3..0e2be5c 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-http-csv-to-kafka/project/Dependencies.scala @@ -1,12 +1,12 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #dependencies val ScalaTestVersion = "3.2.19" - val PekkoVersion = "1.1.3" - val PekkoHttpVersion = "1.1.0" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoHttpVersion = "1.2.0" + val PekkoConnectorsVersion = "1.2.0" val PekkoConnectorsKafkaVersion = "1.1.0" val dependencies = List( @@ -18,8 +18,8 @@ object Dependencies { // Used from Scala "org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion, // Used from Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.17.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.20.0", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.20.0", "org.testcontainers" % "kafka" % "1.17.3", diff --git a/pekko-connectors-sample-http-csv-to-kafka/project/build.properties b/pekko-connectors-sample-http-csv-to-kafka/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-http-csv-to-kafka/project/build.properties +++ b/pekko-connectors-sample-http-csv-to-kafka/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala index b9ac58e..cc4be0d 100644 --- a/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-jdbc-to-elasticsearch/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" + val PekkoVersion = "1.2.1" - val PekkoConnectorsVersion = "1.1.0" + val PekkoConnectorsVersion = "1.2.0" // #deps diff --git a/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties b/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-jdbc-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-jms/project/Dependencies.scala b/pekko-connectors-sample-jms/project/Dependencies.scala index baefc08..050e073 100644 --- a/pekko-connectors-sample-jms/project/Dependencies.scala +++ b/pekko-connectors-sample-jms/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoHttpVersion = "1.1.0" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoHttpVersion = "1.2.0" + val PekkoConnectorsVersion = "1.2.0" // #deps diff --git a/pekko-connectors-sample-jms/project/build.properties b/pekko-connectors-sample-jms/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-jms/project/build.properties +++ b/pekko-connectors-sample-jms/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala index 3acc8dc..936a0c1 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-elasticsearch/project/Dependencies.scala @@ -1,10 +1,10 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoConnectorsVersion = "1.2.0" val PekkoConnectorsKafkaVersion = "1.1.0" // #deps @@ -19,8 +19,8 @@ object Dependencies { // for JSON in Scala "io.spray" %% "spray-json" % "1.3.6", // for JSON in Java - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.17.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.20.0", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.20.0", // Logging "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion, "ch.qos.logback" % "logback-classic" % "1.3.15", diff --git a/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties b/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties +++ b/pekko-connectors-sample-kafka-to-elasticsearch/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 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 6d30f7b..cded925 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala +++ b/pekko-connectors-sample-kafka-to-websocket-clients/project/Dependencies.scala @@ -1,11 +1,11 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" + val PekkoVersion = "1.2.1" val PekkoConnectorsKafkaVersion = "1.1.0" - val PekkoHttpVersion = "1.1.0" + val PekkoHttpVersion = "1.2.0" // #deps val dependencies = List( diff --git a/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties b/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties +++ b/pekko-connectors-sample-kafka-to-websocket-clients/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 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 f6abcd1..a3233ff 100644 --- a/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt +++ b/pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt @@ -1,11 +1,11 @@ organization := "org.apache.pekko" name := "pekko-connectors-samples-mqtt-http-to-s3-java" -ThisBuild / scalaVersion := "2.13.16" +ThisBuild / scalaVersion := "2.13.17" -val PekkoVersion = "1.1.3" -val PekkoHttpVersion = "1.1.0" -val PekkoConnectorsVersion = "1.1.0" +val PekkoVersion = "1.2.1" +val PekkoHttpVersion = "1.2.0" +val PekkoConnectorsVersion = "1.2.0" libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion, @@ -15,8 +15,8 @@ libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, "org.apache.pekko" %% "pekko-connectors-s3" % PekkoConnectorsVersion, "org.apache.pekko" %% "pekko-connectors-mqtt" % PekkoConnectorsVersion, - "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.17.3", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.3", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.20.0", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.20.0", "ch.qos.logback" % "logback-classic" % "1.3.15" ) diff --git a/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties b/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties +++ b/pekko-connectors-sample-mqtt-http-to-s3-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala index 1df1362..133a930 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala +++ b/pekko-connectors-sample-mqtt-to-kafka/project/Dependencies.scala @@ -1,12 +1,12 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoConnectorsVersion = "1.2.0" val PekkoConnectorsKafkaVersion = "1.1.0" - val JacksonDatabindVersion = "2.17.3" + val JacksonDatabindVersion = "2.20.0" // #deps val dependencies = List( diff --git a/pekko-connectors-sample-mqtt-to-kafka/project/build.properties b/pekko-connectors-sample-mqtt-to-kafka/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-mqtt-to-kafka/project/build.properties +++ b/pekko-connectors-sample-mqtt-to-kafka/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 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 3513010..7465458 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala +++ b/pekko-connectors-sample-rotate-logs-to-ftp/project/Dependencies.scala @@ -1,10 +1,10 @@ import sbt._ object Dependencies { - val scalaVer = "2.13.16" + val scalaVer = "2.13.17" // #deps - val PekkoVersion = "1.1.3" - val PekkoConnectorsVersion = "1.1.0" + val PekkoVersion = "1.2.1" + val PekkoConnectorsVersion = "1.2.0" // #deps diff --git a/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties b/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties +++ b/pekko-connectors-sample-rotate-logs-to-ftp/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-sqs-java/build.sbt b/pekko-connectors-sample-sqs-java/build.sbt index c8f4382..c3b7bfa 100644 --- a/pekko-connectors-sample-sqs-java/build.sbt +++ b/pekko-connectors-sample-sqs-java/build.sbt @@ -1,11 +1,11 @@ organization := "org.apache.pekko" name := "pekko-connectors-samples-sqs-java" -ThisBuild / scalaVersion := "2.13.16" +ThisBuild / scalaVersion := "2.13.17" -val PekkoVersion = "1.1.3" -val PekkoConnectorsVersion = "1.1.0" -val jacksonVersion = "2.17.3" +val PekkoVersion = "1.2.1" +val PekkoConnectorsVersion = "1.2.0" +val jacksonVersion = "2.20.0" libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion, @@ -13,8 +13,7 @@ libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-actor-typed" % PekkoVersion, "org.apache.pekko" %% "pekko-actor" % PekkoVersion, "org.apache.pekko" %% "pekko-connectors-sqs" % PekkoConnectorsVersion, - "com.github.pjfanning" %% "aws-spi-pekko-http" % "0.1.0", - "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion, + "org.apache.pekko" %% "pekko-connectors-aws-spi-pekko-http" % PekkoConnectorsVersion, "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion, "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion, "ch.qos.logback" % "logback-classic" % "1.3.15", diff --git a/pekko-connectors-sample-sqs-java/project/build.properties b/pekko-connectors-sample-sqs-java/project/build.properties index 73df629..01a16ed 100644 --- a/pekko-connectors-sample-sqs-java/project/build.properties +++ b/pekko-connectors-sample-sqs-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/Main.java b/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/Main.java index 13f1e1a..a0acb8e 100644 --- a/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/Main.java +++ b/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/Main.java @@ -5,6 +5,7 @@ import org.apache.pekko.actor.typed.ActorRef; import org.apache.pekko.actor.typed.ActorSystem; import org.apache.pekko.actor.typed.javadsl.AskPattern; +import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient; import org.apache.pekko.stream.connectors.sqs.*; import org.apache.pekko.stream.connectors.sqs.javadsl.SqsAckSink; import org.apache.pekko.stream.connectors.sqs.javadsl.SqsPublishFlow; @@ -15,7 +16,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; -import com.github.pjfanning.pekkohttpspi.PekkoHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; diff --git a/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/PublishToSqs.java b/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/PublishToSqs.java index cd8fa68..0ac447e 100644 --- a/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/PublishToSqs.java +++ b/pekko-connectors-sample-sqs-java/src/main/java/samples/sqssample/PublishToSqs.java @@ -3,11 +3,11 @@ import org.apache.pekko.Done; import org.apache.pekko.actor.typed.ActorSystem; import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.stream.connectors.awsspi.PekkoHttpClient; import org.apache.pekko.stream.connectors.sqs.SqsPublishSettings; import org.apache.pekko.stream.connectors.sqs.javadsl.SqsPublishFlow; import org.apache.pekko.stream.javadsl.Sink; import org.apache.pekko.stream.javadsl.Source; -import com.github.pjfanning.pekkohttpspi.PekkoHttpClient; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region;