Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6974fb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6974fb9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6974fb9 Branch: refs/heads/trunk Commit: b6974fb94b5361a2df0431684f2ec2f2ce7a3a03 Parents: bc94d38 df62c62 Author: Dave Brosius <[email protected]> Authored: Fri May 2 22:54:26 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri May 2 22:54:26 2014 -0400 ---------------------------------------------------------------------- build.xml | 8 +-- lib/licenses/logback-classic-1.1.12.txt | 70 --------------------------- lib/licenses/logback-classic-1.1.2.txt | 70 +++++++++++++++++++++++++++ lib/licenses/logback-core-1.1.12.txt | 70 --------------------------- lib/licenses/logback-core-1.1.2.txt | 70 +++++++++++++++++++++++++++ lib/logback-core-1.1.12.jar | Bin 427729 -> 0 bytes lib/logback-core-1.1.2.jar | Bin 0 -> 427729 bytes 7 files changed, 144 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6974fb9/build.xml ---------------------------------------------------------------------- diff --cc build.xml index f504166,b72abc4..32da002 --- a/build.xml +++ b/build.xml @@@ -330,12 -349,10 +330,12 @@@ <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/> <dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/> <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/> - <dependency groupId="org.antlr" artifactId="antlr" version="3.2"/> + <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/> + <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/> + <dependency groupId="org.antlr" artifactId="stringtemplate" version="4.0.2"/> <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/> - <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.12"/> - <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.12"/> + <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/> + <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.9.2"/> <dependency groupId="jline" artifactId="jline" version="1.0">
