iota-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tonyfaust...@apache.org
Subject [4/7] incubator-iota git commit: *Change organization name in build settings. *Remove fey project from build. *Remove main class from ZMQ and Stream.
Date Tue, 05 Jul 2016 20:30:01 GMT
*Change organization name in build settings.
*Remove fey project from build.
*Remove main class from ZMQ and Stream.


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

Branch: refs/heads/master
Commit: c1ac0ab3dfd3d55061ae9204c578cd0119e861a0
Parents: e1031e8
Author: sandy <phalodi@gmail.com>
Authored: Tue Jul 5 23:46:06 2016 +0530
Committer: sandy <phalodi@gmail.com>
Committed: Tue Jul 5 23:46:06 2016 +0530

----------------------------------------------------------------------
 Performers/project/Build.scala         | 17 +++--------------
 Performers/project/BuildSettings.scala |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c1ac0ab3/Performers/project/Build.scala
----------------------------------------------------------------------
diff --git a/Performers/project/Build.scala b/Performers/project/Build.scala
index b4e9504..d326900 100644
--- a/Performers/project/Build.scala
+++ b/Performers/project/Build.scala
@@ -22,7 +22,6 @@ object ModuleDependencies {
 
   import Dependencies._
 
-  val FeyDependencies = provided(akka_actor, fey)
   val StreamDependencies = provided(akka_actor, fey)
   val ZMQDependecies = provided(akka_actor,  fey) ++ compile(zmq)
 }
@@ -34,26 +33,17 @@ object PerformersBuild extends Build {
   lazy val parent = Project(
     id = "jars_parent",
     base = file("."),
-    aggregate = Seq(Stream, ZMQ, Fey),
+    aggregate = Seq(Stream, ZMQ),
     settings = rootbuildSettings ++ Seq(
       aggregate in update := false
     )
   )
 
-  lazy val fey = Project(
-    id = "fey",
-    base = file("./fey"),
-    settings = BasicSettings ++ FeybuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.FeyDependencies,
-      mainClass := Some("org.apache.iota.fey.Application")
-    ))
-
   lazy val stream = Project(
     id = "fey_stream",
     base = file("./stream"),
     settings = BasicSettings ++ StreambuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.StreamDependencies,
-      mainClass := Some("org.apache.iota.fey.performer.stream.Application")
+      libraryDependencies ++= ModuleDependencies.StreamDependencies
 
     ))
 
@@ -61,8 +51,7 @@ object PerformersBuild extends Build {
     id = "fey_zmq",
     base = file("./zmq"),
     settings = BasicSettings ++ ZMQbuildSettings ++ Seq(
-      libraryDependencies ++= ModuleDependencies.ZMQDependecies,
-      mainClass := Some("org.apache.iota.fey.performer.zmq.Application")
+      libraryDependencies ++= ModuleDependencies.ZMQDependecies
     ))
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c1ac0ab3/Performers/project/BuildSettings.scala
----------------------------------------------------------------------
diff --git a/Performers/project/BuildSettings.scala b/Performers/project/BuildSettings.scala
index 8b5fa19..b471364 100644
--- a/Performers/project/BuildSettings.scala
+++ b/Performers/project/BuildSettings.scala
@@ -18,7 +18,7 @@ object BuildSettings {
     name := ParentProject,
     version := Version,
     scalaVersion := ScalaVersion,
-    organization := "com.libit",
+    organization := "org.apache.iota",
     description := "Fey External Jars Project",
     scalacOptions := Seq("-deprecation", "-unchecked", "-encoding", "utf8", "-Xlint")
   )


Mime
View raw message