Skip to content

Commit

Permalink
Bump versions and minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
pbernet committed Sep 19, 2024
1 parent beec0d0 commit c95ac63
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ version := "1.0"

scalaVersion := "2.13.14"

val pekkoVersion = "1.1.0"
val pekkoVersion = "1.1.1"
val pekkoHTTPVersion = "1.1.0-M1"
val pekkoConnectorVersion = "1.0.2"
val pekkoConnectorKafkaVersion = "1.0.0"

val kafkaVersion = "3.7.0"
val activemqVersion = "5.18.5" // We are stuck with 5.x
val artemisVersion = "2.36.0"
val artemisVersion = "2.37.0"
val testContainersVersion = "1.20.1"
val keycloakVersion = "24.0.4"
val sttpVersion = "3.9.0"
Expand Down Expand Up @@ -67,7 +67,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.38.0",
"com.hierynomus" % "sshj" % "0.39.0",
"org.apache.pekko" %% "pekko-connectors-xml" % pekkoConnectorVersion,
"org.apache.pekko" %% "pekko-connectors-ftp" % pekkoConnectorVersion,
"org.apache.pekko" %% "pekko-connectors-elasticsearch" % pekkoConnectorVersion,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2
4 changes: 2 additions & 2 deletions src/main/scala/alpakka/env/JMSServerArtemis.scala
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ object JMSServerArtemis extends App {
try {
val session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE)
val producer = session.createProducer(queue)
val message = session.createTextMessage("Test msg JNDI sent at:" + LocalDateTime.now())
val message = session.createTextMessage("Test msg JNDI sent at: " + LocalDateTime.now())
logger.info("About to send: " + message.getText)
producer.send(message)
val messageConsumer = session.createConsumer(queue)

val messageReceived = messageConsumer.receive(1000).asInstanceOf[TextMessage]
logger.info("Received message JNDI:" + messageReceived.getText)
logger.info("Received message JNDI: " + messageReceived.getText)
} finally {
connection.close()
}
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/alpakka/sftp/SftpEcho.scala
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ object SftpEcho extends App {
val sshClient = new SSHClient(new DefaultConfig)
sshClient.addHostKeyVerifier(new PromiscuousVerifier) // to skip host verification

sshClient.loadKnownHosts()
sshClient.connect(hostname, port)
sshClient.authPassword(username, password)
sshClient
Expand Down
6 changes: 4 additions & 2 deletions src/test/scala/ReverseProxySimulation.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import scala.concurrent.duration.*

/**
* Start [[akkahttp.ReverseProxy]]
* Run this simulation from cmd shell with:
* Run this simulation from cmd shell:
* sbt 'Gatling/testOnly ReverseProxySimulation'
* or from sbt shell:
* Gatling/testOnly ReverseProxySimulation
*/
class ReverseProxySimulation extends Simulation {
val baseUrl = "http://127.0.0.1:8080"
Expand All @@ -24,7 +26,7 @@ class ReverseProxySimulation extends Simulation {
http("Local Mode Request")
.get("/")
.header("Host", "local")
.header("X-Correlation-ID", session => s"1-${session("correlationId").as[Int]}")
.header("X-Correlation-ID", session => s"load-${session.userId}-${session("correlationId").as[Int]}")
.check(status.is(200))
.check(status.saveAs("responseStatus"))
.check(header("X-Correlation-ID").saveAs("responseCorrelationId"))
Expand Down

0 comments on commit c95ac63

Please sign in to comment.