Repository: incubator-s2graph Updated Branches: refs/heads/master 4b6ffc2e3 -> 839ae837d
[S2GRAPH-117] cleaned up logging dependencies to use SLF4j-API only Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/1f5cfde8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/1f5cfde8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/1f5cfde8 Branch: refs/heads/master Commit: 1f5cfde82145afc69f339ade698c06ea0e271f8a Parents: 4b6ffc2 Author: Jong Wook Kim <[email protected]> Authored: Sun Oct 9 22:15:53 2016 -0400 Committer: Jong Wook Kim <[email protected]> Committed: Mon Oct 10 01:43:59 2016 -0400 ---------------------------------------------------------------------- build.sbt | 4 --- conf/application.conf | 6 ++-- loader/build.sbt | 11 +++--- project/Common.scala | 36 ++++++++++++++++---- s2core/build.sbt | 25 +++++++------- s2core/src/main/resources/reference.conf | 6 ++-- s2counter_core/build.sbt | 28 +++++---------- .../src/test/resources/application.conf | 8 ++--- s2counter_loader/build.sbt | 1 - .../src/test/resources/application.conf | 8 ++--- s2rest_netty/build.sbt | 3 +- s2rest_play/build.sbt | 8 ++--- spark/build.sbt | 2 +- 13 files changed, 76 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index b74e191..23ad8ef 100755 --- a/build.sbt +++ b/build.sbt @@ -31,10 +31,6 @@ lazy val commonSettings = Seq( testOptions in Test += Tests.Argument("-oDF"), concurrentRestrictions in Global += Tags.limit(Tags.Test, 1), parallelExecution in Test := false, - libraryDependencies ++= Seq( - "org.scalaz.stream" % "scalaz-stream_2.11" % "0.7.2", - "com.typesafe.netty" % "netty-http-pipelining" % "1.1.4" - ), resolvers ++= Seq( Resolver.mavenLocal ) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/conf/application.conf ---------------------------------------------------------------------- diff --git a/conf/application.conf b/conf/application.conf index 4920380..5dfa653 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -72,6 +72,6 @@ # ex) to use mysql as metastore, change db.default.driver = "com.mysql.jdbc.Driver" # and db.default.url to point to jdbc connection. db.default.driver = "org.h2.Driver" -db.default.url="jdbc:h2:file:./var/metastore;MODE=MYSQL" -db.default.user="sa" -db.default.password="sa" +db.default.url = "jdbc:h2:file:./var/metastore;MODE=MYSQL" +db.default.user = "sa" +db.default.password = "sa" http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/loader/build.sbt ---------------------------------------------------------------------- diff --git a/loader/build.sbt b/loader/build.sbt index 75e268e..0312a3b 100644 --- a/loader/build.sbt +++ b/loader/build.sbt @@ -18,6 +18,7 @@ */ import sbtassembly.Plugin.AssemblyKeys._ +import Common._ name := "s2loader" @@ -29,14 +30,14 @@ projectDependencies := Seq( libraryDependencies ++= Seq( "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility - "org.apache.spark" %% "spark-core" % Common.sparkVersion % "provided", - "org.apache.spark" %% "spark-streaming" % Common.sparkVersion % "provided", - "org.apache.spark" %% "spark-hive" % Common.sparkVersion % "provided", - "org.apache.spark" %% "spark-streaming-kafka" % Common.sparkVersion, + "org.apache.spark" %% "spark-core" % sparkVersion % "provided", + "org.apache.spark" %% "spark-streaming" % sparkVersion % "provided", + "org.apache.spark" %% "spark-hive" % sparkVersion % "provided", + "org.apache.spark" %% "spark-streaming-kafka" % sparkVersion, "org.apache.httpcomponents" % "fluent-hc" % "4.2.5", "org.specs2" %% "specs2-core" % "2.4.11" % "test", "org.scalatest" %% "scalatest" % "2.2.1" % "test", - "org.apache.hadoop" % "hadoop-distcp" % Common.hadoopVersion + "org.apache.hadoop" % "hadoop-distcp" % hadoopVersion ) crossScalaVersions := Seq("2.10.6") http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/project/Common.scala ---------------------------------------------------------------------- diff --git a/project/Common.scala b/project/Common.scala index ef793f1..f0fb222 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -17,13 +17,35 @@ * under the License. */ +import sbt._ + object Common { - // lazy val sparkVersion = "1.4.1-cdh5.3.3" - lazy val sparkVersion = "1.4.1" - lazy val playVersion = "2.3.10" + val sparkVersion = "1.4.1" + val playVersion = "2.5.9" + + val hbaseVersion = "1.2.2" + val hadoopVersion = "2.7.3" + + /** use Log4j 1.2.17 as the SLF4j backend in runtime, with bridging libraries to forward JCL and JUL logs to SLF4j */ + val loggingRuntime = Seq( + "log4j" % "log4j" % "1.2.17", + "org.slf4j" % "slf4j-log4j12" % "1.7.21", + "org.slf4j" % "jcl-over-slf4j" % "1.7.21", + "org.slf4j" % "jul-to-slf4j" % "1.7.21" + ).map(_ % "runtime") + + /** rules to exclude logging backends and bridging libraries from dependency */ + val loggingExcludes = Seq( + ExclusionRule("commons-logging", "commons-logging"), + ExclusionRule("log4j", "log4j"), + ExclusionRule("ch.qos.logback", "*"), + ExclusionRule("org.slf4j", "jcl-over-slf4j"), + ExclusionRule("org.slf4j", "log4j-over-slf4j"), + ExclusionRule("org.slf4j", "slf4j-log4j12"), + ExclusionRule("org.slf4j", "jul-to-slf4j") + ) - lazy val hbaseVersion = "1.2.2" - // lazy val hbaseVersion = "1.0.0-cdh5.4.5" - lazy val hadoopVersion = "2.7.3" - // lazy val hadoopVersion = "2.6.0-cdh5.4.5" + implicit class LoggingExcluder(moduleId: ModuleID) { + def excludeLogging(): ModuleID = moduleId.excludeAll(loggingExcludes: _*) + } } http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2core/build.sbt ---------------------------------------------------------------------- diff --git a/s2core/build.sbt b/s2core/build.sbt index a456ce0..0e19a86 100644 --- a/s2core/build.sbt +++ b/s2core/build.sbt @@ -17,30 +17,31 @@ * under the License. */ +import Common._ + name := """s2core""" scalacOptions ++= Seq("-deprecation") -libraryDependencies ++= Seq( - "ch.qos.logback" % "logback-classic" % "1.1.2", +libraryDependencies ++= loggingRuntime ++ Seq( + "org.slf4j" % "slf4j-api" % "1.7.21", "com.typesafe" % "config" % "1.2.1", - "com.typesafe.play" %% "play-json" % Common.playVersion, + "com.typesafe.play" %% "play-json" % playVersion, "com.typesafe.akka" %% "akka-actor" % "2.3.4", "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility - "org.apache.hbase" % "hbase-client" % Common.hbaseVersion exclude("org.slf4j", "slf4j*"), - "org.apache.hbase" % "hbase-common" % Common.hbaseVersion exclude("org.slf4j", "slf4j*"), - "org.apache.hbase" % "hbase-server" % Common.hbaseVersion exclude("org.slf4j", "slf4j*") exclude("com.google.protobuf", "protobuf*"), - "org.apache.hbase" % "hbase-hadoop-compat" % Common.hbaseVersion exclude("org.slf4j", "slf4j*"), - "org.apache.hbase" % "hbase-hadoop2-compat" % Common.hbaseVersion exclude("org.slf4j", "slf4j*"), - "org.apache.kafka" % "kafka-clients" % "0.8.2.0" exclude("org.slf4j", "slf4j*") exclude("com.sun.jdmk", "j*") exclude("com.sun.jmx", "j*") exclude("javax.jms", "j*"), + "org.apache.hbase" % "hbase-client" % hbaseVersion excludeLogging(), + "org.apache.hbase" % "hbase-common" % hbaseVersion excludeLogging(), + "org.apache.hbase" % "hbase-server" % hbaseVersion excludeLogging() exclude("com.google.protobuf", "protobuf*"), + "org.apache.hbase" % "hbase-hadoop-compat" % hbaseVersion excludeLogging(), + "org.apache.hbase" % "hbase-hadoop2-compat" % hbaseVersion excludeLogging(), + "org.apache.kafka" % "kafka-clients" % "0.8.2.0" excludeAll(loggingExcludes: _*) exclude("com.sun.jdmk", "j*") exclude("com.sun.jmx", "j*") exclude("javax.jms", "j*"), "commons-pool" % "commons-pool" % "1.6", "org.scalatest" %% "scalatest" % "2.2.4" % "test", - "org.scalikejdbc" %% "scalikejdbc" % "2.1.+", + "org.scalikejdbc" %% "scalikejdbc" % "2.1.4", "com.h2database" % "h2" % "1.4.192", - "com.github.danielwegener" % "logback-kafka-appender" % "0.0.4", "com.stumbleupon" % "async" % "1.4.1", "io.netty" % "netty" % "3.9.4.Final" force(), - "org.hbase" % "asynchbase" % "1.7.2", + "org.hbase" % "asynchbase" % "1.7.2" excludeLogging(), "net.bytebuddy" % "byte-buddy" % "1.4.26" ) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2core/src/main/resources/reference.conf ---------------------------------------------------------------------- diff --git a/s2core/src/main/resources/reference.conf b/s2core/src/main/resources/reference.conf index e5c129b..73c949a 100644 --- a/s2core/src/main/resources/reference.conf +++ b/s2core/src/main/resources/reference.conf @@ -49,9 +49,9 @@ cache.max.size=100000 s2graph.models.table.name = "models-dev" db.default.driver = "org.h2.Driver" -db.default.url="jdbc:h2:file:./var/metastore;MODE=MYSQL" -db.default.user = "graph" -db.default.password = "graph" +db.default.url = "jdbc:h2:file:./var/metastore;MODE=MYSQL" +db.default.user = "sa" +db.default.password = "sa" akka { http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2counter_core/build.sbt ---------------------------------------------------------------------- diff --git a/s2counter_core/build.sbt b/s2counter_core/build.sbt index 9a75faf..28a368d 100644 --- a/s2counter_core/build.sbt +++ b/s2counter_core/build.sbt @@ -17,31 +17,19 @@ * under the License. */ +import Common._ + name := "s2counter-core" scalacOptions ++= Seq("-feature", "-deprecation", "-language:existentials") scalacOptions in Test ++= Seq("-Yrangepos") -libraryDependencies ++= Seq( - "ch.qos.logback" % "logback-classic" % "1.1.2", - "com.typesafe" % "config" % "1.2.1", - "com.typesafe.play" %% "play-json" % Common.playVersion, - "com.typesafe.play" %% "play-ws" % Common.playVersion, - "com.typesafe.akka" %% "akka-actor" % "2.3.4", +libraryDependencies ++= loggingRuntime ++ Seq( "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility - "org.apache.hbase" % "hbase-client" % Common.hbaseVersion, - "org.apache.hbase" % "hbase-common" % Common.hbaseVersion, - "org.apache.hbase" % "hbase-hadoop-compat" % Common.hbaseVersion, - "org.apache.hbase" % "hbase-hadoop2-compat" % Common.hbaseVersion, - "org.apache.hadoop" % "hadoop-common" % Common.hadoopVersion, - "org.apache.hadoop" % "hadoop-hdfs" % Common.hadoopVersion, + "com.typesafe.play" %% "play-ws" % playVersion excludeLogging(), + "org.apache.hadoop" % "hadoop-common" % hadoopVersion excludeLogging, + "org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion excludeLogging, "redis.clients" % "jedis" % "2.6.0", - "org.apache.kafka" % "kafka-clients" % "0.8.2.0", - "com.h2database" % "h2" % "1.4.192", - "org.scalikejdbc" %% "scalikejdbc" % "2.1.+", - "org.specs2" %% "specs2-core" % "3.6" % "test", - "org.scalatest" %% "scalatest" % "2.2.1" % "test" -).map { moduleId => - moduleId.exclude("org.slf4j", "slf4j-log4j12") -} + "org.specs2" %% "specs2-core" % "3.8.5" % "test" +) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2counter_core/src/test/resources/application.conf ---------------------------------------------------------------------- diff --git a/s2counter_core/src/test/resources/application.conf b/s2counter_core/src/test/resources/application.conf index a1cd11b..b744a71 100644 --- a/s2counter_core/src/test/resources/application.conf +++ b/s2counter_core/src/test/resources/application.conf @@ -22,10 +22,10 @@ phase=dev host=localhost # DB -db.default.driver=com.mysql.jdbc.Driver -db.default.url="jdbc:mysql://"${host}":3306/graph_dev" -db.default.user=graph -db.default.password=graph +db.default.driver = "org.h2.Driver" +db.default.url = "jdbc:h2:file:./var/metastore;MODE=MYSQL" +db.default.user = "sa" +db.default.password = "sa" # Kafka kafka { http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2counter_loader/build.sbt ---------------------------------------------------------------------- diff --git a/s2counter_loader/build.sbt b/s2counter_loader/build.sbt index 8de6281..d0f1f41 100644 --- a/s2counter_loader/build.sbt +++ b/s2counter_loader/build.sbt @@ -28,7 +28,6 @@ libraryDependencies ++= Seq( "org.apache.spark" %% "spark-core" % Common.sparkVersion % "provided", "org.apache.spark" %% "spark-streaming" % Common.sparkVersion % "provided", "org.apache.spark" %% "spark-streaming-kafka" % Common.sparkVersion, - "com.typesafe.play" %% "play-ws" % Common.playVersion, "javax.servlet" % "javax.servlet-api" % "3.0.1" % "test", "org.scalatest" %% "scalatest" % "2.2.4" % "test" ) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2counter_loader/src/test/resources/application.conf ---------------------------------------------------------------------- diff --git a/s2counter_loader/src/test/resources/application.conf b/s2counter_loader/src/test/resources/application.conf index 204d1c7..b74fd94 100644 --- a/s2counter_loader/src/test/resources/application.conf +++ b/s2counter_loader/src/test/resources/application.conf @@ -22,10 +22,10 @@ phase=dev host=localhost # DB -db.default.driver=com.mysql.jdbc.Driver -db.default.url="jdbc:mysql://"${host}":3306/graph_dev" -db.default.user=graph -db.default.password=graph +db.default.driver = "org.h2.Driver" +db.default.url = "jdbc:h2:file:./var/metastore;MODE=MYSQL" +db.default.user = "sa" +db.default.password = "sa" # Kafka kafka { http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2rest_netty/build.sbt ---------------------------------------------------------------------- diff --git a/s2rest_netty/build.sbt b/s2rest_netty/build.sbt index b7c5484..422cfef 100644 --- a/s2rest_netty/build.sbt +++ b/s2rest_netty/build.sbt @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ +import Common._ name := "s2rest_netty" enablePlugins(JavaAppPackaging) -libraryDependencies ++= Seq( +libraryDependencies ++= loggingRuntime ++ Seq( "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility "io.netty" % "netty-all" % "4.0.33.Final" ) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/s2rest_play/build.sbt ---------------------------------------------------------------------- diff --git a/s2rest_play/build.sbt b/s2rest_play/build.sbt index 6edb8e8..dfe7205 100644 --- a/s2rest_play/build.sbt +++ b/s2rest_play/build.sbt @@ -16,16 +16,14 @@ * specific language governing permissions and limitations * under the License. */ +import Common._ name := "s2rest_play" scalacOptions in Test ++= Seq("-Yrangepos") -libraryDependencies ++= Seq( - ws, - filters, - "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility - "com.github.danielwegener" % "logback-kafka-appender" % "0.0.3" +libraryDependencies := loggingRuntime ++ (libraryDependencies.value ++ Seq(ws, filters)).map(_.excludeLogging()) ++ Seq( + "com.google.guava" % "guava" % "12.0.1" force() // use this old version of guava to avoid incompatibility ) enablePlugins(JavaServerAppPackaging) http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1f5cfde8/spark/build.sbt ---------------------------------------------------------------------- diff --git a/spark/build.sbt b/spark/build.sbt index f5412d8..1ab6ecb 100644 --- a/spark/build.sbt +++ b/spark/build.sbt @@ -27,6 +27,6 @@ libraryDependencies ++= Seq( "org.apache.spark" %% "spark-streaming" % Common.sparkVersion % "provided", "org.apache.spark" %% "spark-streaming-kafka" % Common.sparkVersion, "com.typesafe.play" %% "play-json" % Common.playVersion, - "org.specs2" %% "specs2-core" % "3.6" % "test", + "org.specs2" %% "specs2-core" % "3.8.5" % "test", "org.scalatest" %% "scalatest" % "2.2.1" % "test" )
