You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iota.apache.org by to...@apache.org on 2016/09/29 02:05:46 UTC

[1/2] incubator-iota git commit: Corrected the spelling for cleaning and removed the scalastyle warning for println

Repository: incubator-iota
Updated Branches:
  refs/heads/master 9b619625d -> 4a79b5255


Corrected the spelling for cleaning and removed the scalastyle warning for println


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

Branch: refs/heads/master
Commit: 77cab8c3e9817416b6db425f4aec1e01ba471d1d
Parents: 9b61962
Author: Shivansh <sh...@gmail.com>
Authored: Wed Sep 28 07:46:38 2016 +0530
Committer: Shivansh <sh...@gmail.com>
Committed: Wed Sep 28 07:46:38 2016 +0530

----------------------------------------------------------------------
 project/Build.scala | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/77cab8c3/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 8bff270..c648ce8 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -17,6 +17,7 @@
 
 import sbt._
 import sbt.Keys._
+import sbtassembly.AssemblyPlugin.autoImport._
 
 object ModuleDependencies {
 
@@ -53,22 +54,24 @@ object IotaBuild extends Build {
     id = "fey-stream",
     base = file("./performers/stream"),
     settings = BasicSettings ++ StreambuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.StreamDependencies
-
-    ))
+      libraryDependencies ++= ModuleDependencies.StreamDependencies,
+      assemblyJarName in assembly := "fey_stream.jar"
+    )
+  )
 
    lazy val zmq = Project(
     id = "fey-zmq",
     base = file("./performers/zmq"),
     settings = BasicSettings ++ ZMQbuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.ZMQDependencies
+      libraryDependencies ++= ModuleDependencies.ZMQDependencies,
+        assemblyJarName in assembly := "fey_zmq.jar"
     ))
 
   lazy val virtual_sensor = Project(
     id = "fey-virtual-sensor",
     base = file("./performers/virtual_sensor"),
     settings = BasicSettings ++ VirtualSensorbuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.VirtualSensorDependencies
+      libraryDependencies ++= ModuleDependencies.VirtualSensorDependencies,
+      assemblyJarName in assembly := "fey-virtual-sensor.jar"
     ))
-
 }


[2/2] incubator-iota git commit: Added the jar name for stream and zmq as specified in the Readme file

Posted by to...@apache.org.
Added the jar name for stream and zmq as specified in the Readme file


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

Branch: refs/heads/master
Commit: 4a79b525575ae69faf491b23f39421ab1afd2941
Parents: 77cab8c
Author: Shivansh <sh...@gmail.com>
Authored: Wed Sep 28 07:47:46 2016 +0530
Committer: Shivansh <sh...@gmail.com>
Committed: Wed Sep 28 07:47:46 2016 +0530

----------------------------------------------------------------------
 project/BuildSettings.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/4a79b525/project/BuildSettings.scala
----------------------------------------------------------------------
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index c2013b1..8817df7 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -65,7 +65,7 @@ object BuildSettings {
     //All tests need to be execute sequentially
     parallelExecution in Test := false,
     testOptions in Test += Tests.Cleanup( () => {
-      println("CLenning up")
+      print("\nCLeaning up")
       removeAll("/tmp/fey/test")
       def removeAll(path: String) = {
         def getRecursively(f: File): Seq[File] =