Repository: incubator-s2graph Updated Branches: refs/heads/master f5d14ab92 -> 75c30bb31
[S2GRAPH-31] Remove playframework dependencies on s2core/build.sbt. remove ws, filters which is not necessary for s2core. add missing netty jar that is missed out on S2GRAPH-9. JIRA: [S2GRAPH-31] https://issues.apache.org/jira/browse/S2GRAPH-31 Pull Request: Closes #16 Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/75c30bb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/75c30bb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/75c30bb3 Branch: refs/heads/master Commit: 75c30bb313b6355af27234e98c1b44bd5a372a7c Parents: f5d14ab Author: DO YUNG YOON <steams...@apache.org> Authored: Tue Feb 23 16:10:04 2016 +0900 Committer: DO YUNG YOON <steams...@apache.org> Committed: Tue Feb 23 16:10:04 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ s2core/build.sbt | 9 ++++++--- s2core/lib/netty-3.9.4.Final.jar | Bin 0 -> 1310154 bytes 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/75c30bb3/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index bb927e8..9d9b103 100644 --- a/CHANGES +++ b/CHANGES @@ -38,6 +38,8 @@ Release 0.12.1 - unreleased S2GRAPH-7: Abstract common codes for rest project into s2core. (Committed by daewon). + S2GRAPH-31: Remove playframework dependencies on s2core/build.sbt. (Committed by DOYUNG YOON). + TEST S2GRAPH-21: Change PostProcessBenchmarkSpec not to store and fetch test data from storage. (Committed by DOYUNG YOON). http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/75c30bb3/s2core/build.sbt ---------------------------------------------------------------------- diff --git a/s2core/build.sbt b/s2core/build.sbt index b68fa12..7a3c2d5 100644 --- a/s2core/build.sbt +++ b/s2core/build.sbt @@ -3,8 +3,10 @@ name := """s2core""" scalacOptions ++= Seq("-deprecation") libraryDependencies ++= Seq( - ws, - filters, + "ch.qos.logback" % "logback-classic" % "1.1.2", + "com.typesafe" % "config" % "1.2.1", + "com.typesafe.play" %% "play-json" % Common.playVersion, + "com.typesafe.akka" %% "akka-actor" % "2.3.4", "org.apache.hbase" % "hbase-client" % Common.hbaseVersion excludeAll ExclusionRule(organization = "org.slf4j"), "org.apache.hbase" % "hbase-common" % Common.hbaseVersion excludeAll ExclusionRule(organization = "org.slf4j"), "org.apache.hbase" % "hbase-server" % Common.hbaseVersion excludeAll(ExclusionRule(organization = "org.slf4j"), ExclusionRule(organization = "com.google.protobuf")), @@ -13,7 +15,8 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % "2.2.4" % "test", "org.scalikejdbc" %% "scalikejdbc" % "2.1.+", "mysql" % "mysql-connector-java" % "5.1.28", - "org.apache.kafka" % "kafka-clients" % "0.8.2.0" excludeAll(ExclusionRule(organization = "org.slf4j"), ExclusionRule(organization = "com.sun.jdmk"), ExclusionRule(organization = "com.sun.jmx"), ExclusionRule(organization = "javax.jms")) + "org.apache.kafka" % "kafka-clients" % "0.8.2.0" excludeAll(ExclusionRule(organization = "org.slf4j"), ExclusionRule(organization = "com.sun.jdmk"), ExclusionRule(organization = "com.sun.jmx"), ExclusionRule(organization = "javax.jms")), + "com.github.danielwegener" % "logback-kafka-appender" % "0.0.4" ) libraryDependencies := { http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/75c30bb3/s2core/lib/netty-3.9.4.Final.jar ---------------------------------------------------------------------- diff --git a/s2core/lib/netty-3.9.4.Final.jar b/s2core/lib/netty-3.9.4.Final.jar new file mode 100644 index 0000000..7ee6ba4 Binary files /dev/null and b/s2core/lib/netty-3.9.4.Final.jar differ
