From f40609a00706c8c171f7b86aa6562005c541c93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20V=C3=A1zquez?= Date: Tue, 25 Jul 2017 19:27:24 +0200 Subject: [PATCH] FTP: improve testing stability --- .jvmopts | 1 + .../test/java/akka/stream/alpakka/ftp/FtpBaseSupport.java | 2 +- project/Dependencies.scala | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.jvmopts b/.jvmopts index 25cdca2655..f1a74e09bf 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,4 +1,5 @@ -Dfile.encoding=UTF8 +-Djava.security.egd=file:/dev/./urandom -Xms1g -Xmx1g -Xss6M diff --git a/ftp/src/test/java/akka/stream/alpakka/ftp/FtpBaseSupport.java b/ftp/src/test/java/akka/stream/alpakka/ftp/FtpBaseSupport.java index 29bc582c0a..d12ca576d8 100644 --- a/ftp/src/test/java/akka/stream/alpakka/ftp/FtpBaseSupport.java +++ b/ftp/src/test/java/akka/stream/alpakka/ftp/FtpBaseSupport.java @@ -44,7 +44,7 @@ abstract class FtpBaseSupport implements FtpSupport, AkkaSupport { usersFile = new File(getClass().getClassLoader().getResource("users.properties").getFile()); port = AvailablePortFinder.getNextAvailable(BASE_PORT); - system = ActorSystem.create("default"); + system = ActorSystem.create("alpakka-ftp"); materializer = ActorMaterializer.create(system); } finally { port = BASE_PORT; diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 87d36dfbc5..af0ffc6110 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -60,10 +60,11 @@ object Dependencies { val Ftp = Seq( libraryDependencies ++= Seq( - "commons-net" % "commons-net" % "3.5", // ApacheV2 + "commons-net" % "commons-net" % "3.6", // ApacheV2 "com.hierynomus" % "sshj" % "0.21.1", // ApacheV2 "org.apache.ftpserver" % "ftpserver-core" % "1.1.1" % Test, // ApacheV2 - "org.apache.sshd" % "sshd-core" % "1.4.0" % Test, // ApacheV2 + "org.apache.sshd" % "sshd-core" % "1.6.0" % Test, // ApacheV2 + "net.i2p.crypto" % "eddsa" % "0.2.0" % Test, // CC0 1.0 Universal "com.google.jimfs" % "jimfs" % "1.1" % Test, // ApacheV2 "org.slf4j" % "slf4j-api" % "1.7.21" % Test, // MIT "ch.qos.logback" % "logback-classic" % "1.1.7" % Test, // Eclipse Public License 1.0