Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/515e4a22 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/515e4a22 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/515e4a22 Branch: refs/heads/cassandra-3.11 Commit: 515e4a2276d68d1d4f35da2a7daa92dd01936f8f Parents: 23a1dee 76ad028 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Feb 14 23:26:39 2017 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Feb 14 23:26:39 2017 +0000 ---------------------------------------------------------------------- build.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/515e4a22/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 49dd95a,4e3011f..0eef700 --- a/build.xml +++ b/build.xml @@@ -446,13 -411,9 +446,14 @@@ <exclusion groupId="log4j" artifactId="log4j"/> </dependency> <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> - + <dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" /> + <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" /> + <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" /> + <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" /> + <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" /> + <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/> </dependencyManagement> + <developer id="adelapena" name="Andres de la Peña"/> <developer id="alakshman" name="Avinash Lakshman"/> <developer id="aleksey" name="Aleksey Yeschenko"/> <developer id="amorton" name="Aaron Morton"/>
