Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ThisBuild / scalaVersion := "2.13.16"
ThisBuild / scalaVersion := "2.13.17"

enablePlugins(ParadoxPlugin, PekkoParadoxPlugin, ParadoxSitePlugin)

Expand Down
2 changes: 1 addition & 1 deletion docs/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.7
sbt.version=1.11.7

Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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",

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
8 changes: 4 additions & 4 deletions pekko-connectors-sample-jms/project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion pekko-connectors-sample-jms/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
12 changes: 6 additions & 6 deletions pekko-connectors-sample-mqtt-http-to-s3-java/build.sbt
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
11 changes: 5 additions & 6 deletions pekko-connectors-sample-sqs-java/build.sbt
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
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,
"org.apache.pekko" %% "pekko-stream" % PekkoVersion,
"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",
Expand Down
2 changes: 1 addition & 1 deletion pekko-connectors-sample-sqs-java/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.7
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down