Skip to content

Commit

Permalink
Bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
pbernet committed Jan 30, 2024
1 parent 68e366f commit 1a5b060
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 32 deletions.
24 changes: 12 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ val pekkoHTTPVersion = "1.0.0"

val pekkoConnectorVersion = "1.0.2"
val pekkoConnectorKafkaVersion = "1.0.0"
val kafkaVersion = "3.4.1"
val kafkaVersion = "3.6.1"

val activemqVersion = "5.17.6"
val activemqVersion = "5.18.3"
val artemisVersion = "2.31.2"
val testContainersVersion = "1.19.3"
val testContainersVersion = "1.19.4"
val keycloakVersion = "21.1.2" // stay with 21.x because of Java 11 compatibility
val sttpVersion = "3.9.0"
val influxdbVersion = "6.10.0"
val awsClientVersion = "2.23.11"
val awsClientVersion = "2.23.12"

libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",
Expand All @@ -32,7 +32,7 @@ libraryDependencies ++= Seq(

"org.apache.pekko" %% "pekko-http" % pekkoHTTPVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % pekkoHTTPVersion,
"org.json" % "json" % "20230227",
"org.json" % "json" % "20231013",

// sttp wraps around akka-http to allow for concise clients
"com.softwaremill.sttp.client3" %% "core" % sttpVersion,
Expand All @@ -43,12 +43,12 @@ libraryDependencies ++= Seq(
"org.apache.activemq" % "activemq-kahadb-store" % activemqVersion exclude("com.fasterxml.jackson.core", "jackson-databind"),
"org.apache.pekko" %% "pekko-connectors-jms" % pekkoConnectorVersion,
"javax.jms" % "jms" % "1.1",
"javax.xml.bind" % "jaxb-api" % "2.3.0",
"javax.xml.bind" % "jaxb-api" % "2.3.1",
"org.apache.activemq" % "artemis-jms-server" % artemisVersion,
"org.apache.activemq" % "artemis-protocols" % artemisVersion pomOnly(),
"org.apache.activemq" % "artemis-openwire-protocol" % artemisVersion,

"org.bouncycastle" % "bcprov-jdk15to18" % "1.76",
"org.bouncycastle" % "bcprov-jdk15to18" % "1.77",

"org.apache.pekko" %% "pekko-connectors-kafka" % pekkoConnectorKafkaVersion,
"org.apache.kafka" %% "kafka" % kafkaVersion,
Expand All @@ -58,7 +58,7 @@ libraryDependencies ++= Seq(
"org.apache.pekko" %% "pekko-connectors-sse" % pekkoConnectorVersion,
"org.apache.pekko" %% "pekko-connectors-file" % pekkoConnectorVersion,
// With the latest sshj lib explicitly included, we get a more robust behaviour on "large" data sets in SftpEcho
"com.hierynomus" % "sshj" % "0.35.0",
"com.hierynomus" % "sshj" % "0.38.0",
"org.apache.pekko" %% "pekko-connectors-xml" % pekkoConnectorVersion,
"org.apache.pekko" %% "pekko-connectors-ftp" % pekkoConnectorVersion,
"org.apache.pekko" %% "pekko-connectors-elasticsearch" % pekkoConnectorVersion,
Expand Down Expand Up @@ -89,15 +89,15 @@ libraryDependencies ++= Seq(
"ca.uhn.hapi" % "hapi-structures-v25" % "2.3",
"ca.uhn.hapi" % "hapi-structures-v281" % "2.3",

"org.apache.opennlp" % "opennlp-tools" % "2.2.0",
"org.apache.opennlp" % "opennlp-tools" % "2.3.1",

"com.crowdscriber.captions" %% "caption-parser" % "0.1.6",

"com.typesafe.play" %% "play-json" % "2.9.4",
"org.apache.pekko" %% "pekko-serialization-jackson" % pekkoVersion,

"org.apache.httpcomponents.client5" % "httpclient5" % "5.2.1",
"org.apache.httpcomponents.core5" % "httpcore5" % "5.2",
"org.apache.httpcomponents.client5" % "httpclient5" % "5.3.1",
"org.apache.httpcomponents.core5" % "httpcore5" % "5.2.4",
"commons-io" % "commons-io" % "2.11.0",
"org.apache.commons" % "commons-lang3" % "3.12.0",
"com.twitter" %% "bijection-avro" % "0.9.7",
Expand Down Expand Up @@ -126,7 +126,7 @@ libraryDependencies ++= Seq(
"com.clickhouse" % "clickhouse-jdbc" % "0.6.0",
"com.crobox.clickhouse" %% "client" % "1.1.4",

"org.opensearch" % "opensearch-testcontainers" % "2.0.0",
"org.opensearch" % "opensearch-testcontainers" % "2.0.1",
"com.github.dasniko" % "testcontainers-keycloak" % "2.5.0",
"eu.rekawek.toxiproxy" % "toxiproxy-java" % "2.1.7",
"org.testcontainers" % "junit-jupiter" % testContainersVersion % Test,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/alpakka/env/KafkaServerTestcontainers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KafkaServerTestcontainers {
// Pin cp-kafka version for now, because 'latest' does not work on github actions anymore
// https://hub.docker.com/r/confluentinc/cp-kafka
// https://docs.confluent.io/platform/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
val kafkaVersion = "7.1.1"
val kafkaVersion = "7.5.3"
val imageName = s"confluentinc/cp-kafka:$kafkaVersion"
val originalPort = 9093
var mappedPort = 1111
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ object SSEtoElasticsearch extends App {
// elasticsearchContainer.start()
private val dockerImageNameOS = DockerImageName
.parse("opensearchproject/opensearch")
.withTag("1.3.9")
.withTag("1.3.14")
private val searchContainer = new OpensearchContainer(dockerImageNameOS);
searchContainer.start()

Expand Down
38 changes: 20 additions & 18 deletions src/test/scala/alpakka/tcp_to_websockets/AlpakkaTrophySpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,26 @@ final class AlpakkaTrophySpec extends AsyncWordSpec with Matchers with BeforeAnd
// 10 + 1 Initial message
new LogFileScanner().run(20, 10, "Starting test: NOT Happy path should recover after Kafka2Websocket restart", "WebsocketServer received:").length should be >= (numberOfMessages + 1)
}
// OK, when started on its own. NOK when run in suite
// "recover after WebsocketServer restart" in {
// val numberOfMessages = 10
// Hl7TcpClient(numberOfMessages)
//
// // Stopping after half of the msg are processed
// Thread.sleep(5000)
//
// logger.info("Re-starting WebsocketServer...")
// websocketServer.stop()
// websocketServer = WebsocketServer()
// websocketServer.run()
//
// // The restart of the Kafka consumer and the recovery of the ws connection needs a long time...
// // Unfortunately, even with the pessimistic connection check approach in Kafka2Websocket>>safeSendToWebsocket,
// // due to the async sending via SourceQueue, we loose an in-flight message sometimes :-(
// new LogFileScanner().run(20, 10, "Starting test: NOT Happy path should recover after WebsocketServer restart", "WebsocketServer received:").length should be >= (numberOfMessages + 1)
// }

// OK, when started on its own. NOK when run in suite
"recover after WebsocketServer restart" in {
val numberOfMessages = 10
Hl7TcpClient(numberOfMessages)

// Stopping after half of the msg are processed
Thread.sleep(5000)

logger.info("Re-starting WebsocketServer...")
websocketServer.stop()
websocketServer = WebsocketServer()
websocketServer.run()

// The restart of the Kafka consumer and the recovery of the ws connection needs a long time...
// Unfortunately, even with the pessimistic connection check approach in Kafka2Websocket>>safeSendToWebsocket,
// due to the async sending via SourceQueue, we may loose in-flight message(s) sometimes :-(
// 10 - 1 (lost in-flight message) + 1 (initial message)
new LogFileScanner().run(30, 10, "Starting test: NOT Happy path should recover after WebsocketServer restart", "WebsocketServer received:").length should be >= (numberOfMessages - 1 + 1)
}

"recover after Kafka restart" in {
val numberOfMessages = 10
Expand Down

0 comments on commit 1a5b060

Please sign in to comment.