You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/10/10 12:04:33 UTC
incubator-s2graph git commit: [S2GRAPH-120] Netty version is conflict
with play 2.5.9.
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 79ad41526 -> 4325ff130
[S2GRAPH-120] Netty version is conflict with play 2.5.9.
JIRA:
[S2GRAPH-120] https://issues.apache.org/jira/browse/S2GRAPH-120
Pull Request:
Closes #90
Authors
DO YUNG YOON: steamshon@apache.org
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/4325ff13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/4325ff13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/4325ff13
Branch: refs/heads/master
Commit: 4325ff1303ce606909bc16b5cbee53c8a5b23653
Parents: 79ad415
Author: DO YUNG YOON <st...@apache.org>
Authored: Mon Oct 10 14:03:48 2016 +0200
Committer: DO YUNG YOON <st...@apache.org>
Committed: Mon Oct 10 14:03:48 2016 +0200
----------------------------------------------------------------------
CHANGES | 2 ++
s2rest_play/build.sbt | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/4325ff13/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8740c59..945e464 100644
--- a/CHANGES
+++ b/CHANGES
@@ -111,6 +111,8 @@ Release 0.1.0 - unreleased
S2GRAPH-64: incrementCounts yield type case exception (Committed by DOYUNG YOON).
S2GRAPH-118: Fix compile error on test cases on loader project (Committed by DOYUNG YOON).
+
+ S2GRAPH-120: Netty version is conflict with play 2.5.9 (Committed by DOYUNG YOON).
TASKS
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/4325ff13/s2rest_play/build.sbt
----------------------------------------------------------------------
diff --git a/s2rest_play/build.sbt b/s2rest_play/build.sbt
index 7583ad9..bab13cd 100644
--- a/s2rest_play/build.sbt
+++ b/s2rest_play/build.sbt
@@ -23,7 +23,8 @@ name := "s2rest_play"
scalacOptions in Test ++= Seq("-Yrangepos")
libraryDependencies := (libraryDependencies.value ++ Seq(ws, filters, specs2 % Test)).map(_.excludeLogging()) ++ Seq(
- "com.google.guava" % "guava" % "12.0.1" force() // use this old version of guava to avoid incompatibility
+ "com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility
+ "io.netty" % "netty-all" % "4.0.40.Final" force()
//"org.specs2" %% "specs2-core" % specs2Version % "test"
)