Merge branch 'trivial' of https://github.com/shiv4nsh/incubator-iota
diff --git a/Readme.md b/Readme.md
index 7254e66..a8cff21 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,9 +5,9 @@
1. The **Fey Engine** in the folder fey-core - This is written in Scala and uses the Akka framework
2. **Performers** these are the "third party" or user defined components found in the folder Performers
-3. iota can be deployed across devices, standalone servers and clusters the Deployments folder is a set uf helper scripts that can be used in deploying iota in these different contexts.
+3. iota can be deployed across devices, standalone servers and clusters the Deployments folder is a set of helper scripts that can be used in deploying iota in these different contexts.
4. iota management is a Django (python) based management system for iota whose code can be found in the management folder
## iota architecture
- 
\ No newline at end of file
+ 
diff --git a/fey-core/src/main/resources/application.conf b/fey-core/src/main/resources/application.conf
index e732880..c0eaea7 100644
--- a/fey-core/src/main/resources/application.conf
+++ b/fey-core/src/main/resources/application.conf
@@ -94,7 +94,7 @@
type = "COMPLETE"
}
port = 16666
- urlPath = "127.0.0.1"
+ urlPath = "0.0.0.0"
}
// Fey akka configuration. Can not be overwritten by user
@@ -102,6 +102,7 @@
loggers = ["akka.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+ log-config-on-start = "off"
fey-dispatchers {
control-aware-dispatcher {
diff --git a/fey-core/src/test/resources/fey-test-actor.jar b/fey-core/src/test/resources/fey-test-actor.jar
index e072c7b..a469aad 100644
--- a/fey-core/src/test/resources/fey-test-actor.jar
+++ b/fey-core/src/test/resources/fey-test-actor.jar
Binary files differ
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 8817df7..2085e5f 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -54,9 +54,13 @@
Some("releases" at nexus + "releases")
},
publishMavenStyle := true,
- conflictManager := ConflictManager.all,
+ conflictManager := ConflictManager.latestRevision,
assemblyMergeStrategy in assembly := {
- case PathList("org", "slf4j", xs @ _*) => MergeStrategy.last
+ case "reference.conf" => MergeStrategy.concat
+ case "application.conf" => MergeStrategy.concat
+ case PathList("org", "slf4j", xs @ _*) => MergeStrategy.last
+ case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.last
+ case PathList("scala", "xml", xs @ _*) => MergeStrategy.last
case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 63cdce1..b75c082 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -29,15 +29,16 @@
val codec = "commons-codec" % "commons-codec" % "1.10"
val apacheIO = "commons-io" % "commons-io" % "2.4"
- val akka_actor = "com.typesafe.akka" %% "akka-actor" % "2.4.2"
+ val akka_actor = "com.typesafe.akka" %% "akka-actor" % "2.4.10"
+
val typesafe_config = "com.typesafe" % "config" % "1.3.0"
val playJson = "com.typesafe.play" %% "play-json" % "2.5.3"
- val playNetty = "com.typesafe.play" %% "play-netty-server" % "2.5.3"
+ val playNetty = "com.typesafe.play" %% "play-netty-server" % "2.5.8"
val jsonValidator = "com.eclipsesource" %% "play-json-schema-validator" % "0.7.0"
//Logger
- val slf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.4.2"
+ val slf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.4.10"
val log4jbind = "ch.qos.logback" % "logback-classic" % "1.1.7"
val javaFilter = "janino" % "janino" % "2.5.10"
@@ -46,7 +47,7 @@
val sprayRouting = "io.spray" %% "spray-routing" % "1.3.3"
//Tests
- val akka_testkit = "com.typesafe.akka" %% "akka-testkit" % "2.4.2"
- val scala_test = "org.scalatest" %% "scalatest" % "3.0.0-RC4"
+ val akka_testkit = "com.typesafe.akka" %% "akka-testkit" % "2.4.8"
+ val scala_test = "org.scalatest" %% "scalatest" % "3.0.0-RC4"
}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1c4eadc..53aec4d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,3 +4,4 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.9.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
