Updated Branches: refs/heads/trunk 0dd3438ac -> 6da81cd5c
don't pull in slf4j-log4j12.jar dependency from thrift-server Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6da81cd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6da81cd5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6da81cd5 Branch: refs/heads/trunk Commit: 6da81cd5cc625b441ca5ae72bde8fcd73ec4465a Parents: 0dd3438 Author: Dave Brosius <dbros...@apache.org> Authored: Fri Aug 16 02:28:17 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Aug 16 02:28:17 2013 -0400 ---------------------------------------------------------------------- build.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6da81cd5/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index dc4add2..92f18f8 100644 --- a/build.xml +++ b/build.xml @@ -354,7 +354,9 @@ <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/> <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/> <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/> - <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/> + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + </dependency> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/> <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
