iota-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tonyfaust...@apache.org
Subject [1/3] incubator-iota git commit: [IOTA-33] - Upgrade aka version on Fey to 2.4.10
Date Tue, 15 Nov 2016 00:49:35 GMT
Repository: incubator-iota
Updated Branches:
  refs/heads/master e08e775e5 -> 43eb0ba1d


[IOTA-33] - Upgrade aka version on Fey to 2.4.10


Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/9c41fb00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/9c41fb00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/9c41fb00

Branch: refs/heads/master
Commit: 9c41fb007268b8a38b503af7f19d219ba82a99c6
Parents: e08e775
Author: Barbara Gomes <barbaramaltagomes@gmail.com>
Authored: Thu Nov 3 10:24:44 2016 -0700
Committer: Barbara Gomes <barbaramaltagomes@gmail.com>
Committed: Thu Nov 3 10:24:44 2016 -0700

----------------------------------------------------------------------
 fey-core/src/main/resources/application.conf   |   3 ++-
 fey-core/src/test/resources/fey-test-actor.jar | Bin 17735 -> 17735 bytes
 project/BuildSettings.scala                    |   8 ++++++--
 project/Dependencies.scala                     |  11 ++++++-----
 project/plugins.sbt                            |   1 +
 5 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/9c41fb00/fey-core/src/main/resources/application.conf
----------------------------------------------------------------------
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 @@ fey-global-configuration{
     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 @@ akka {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "DEBUG"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+  log-config-on-start = "off"
 
   fey-dispatchers {
     control-aware-dispatcher {

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/9c41fb00/fey-core/src/test/resources/fey-test-actor.jar
----------------------------------------------------------------------
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
Binary files a/fey-core/src/test/resources/fey-test-actor.jar and b/fey-core/src/test/resources/fey-test-actor.jar
differ

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/9c41fb00/project/BuildSettings.scala
----------------------------------------------------------------------
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 @@ object BuildSettings {
         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)

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/9c41fb00/project/Dependencies.scala
----------------------------------------------------------------------
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 @@ object Dependencies {
   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 @@ object Dependencies {
   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"
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/9c41fb00/project/plugins.sbt
----------------------------------------------------------------------
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("com.eed3si9n" % "sbt-assembly" % "0.13.0")
 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")


Mime
View raw message