Skip to content
This repository was archived by the owner on Nov 22, 2017. It is now read-only.

Make Solandra compile with Cassandra 1.1beta2 #169

Merged
tjake merged 6 commits into from
Apr 12, 2012
Merged

Make Solandra compile with Cassandra 1.1beta2 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55ac05f
Upgrade Cassandra to 1.1beta2 and fix compilation errors
benmccann Mar 31, 2012
817d22b
Allow the server to attempt starting up
benmccann Mar 31, 2012
1f4aa1d
Upgrade cassandra.yaml
benmccann Mar 31, 2012
e455270
Update ivy.xml to allow startup
benmccann Mar 31, 2012
e64a2fc
Add missing work in comment
benmccann Mar 31, 2012
f7f54e7
Fix schema creation
benmccann Mar 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,22 @@
<info organisation="solandra" module="solandra"/>

<dependencies>
<dependency org="junit" name="junit" rev="4.6" conf="* -> *,!sources,!javadoc" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.antlr" name="antlr" rev="3.2" conf="* -> *,!sources,!javadoc" />
<dependency org="commons-cli" name="commons-cli" rev="1.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="* -> *,!sources,!javadoc"/>
<dependency org="junit" name="junit" rev="4.10" conf="* -> *,!sources,!javadoc" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.4" conf="* -> *,!sources,!javadoc"/>
<dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="* -> *,!sources,!javadoc"/>
<dependency org="org.apache.solr" name="solr-core" rev="3.4.0" conf="* -> *,!javadoc">
<exclude org="org.mortbay.jetty"/>
<exclude org="org.slf4j"/>
</dependency>

<dependency org="org.apache.lucene" name="lucene-core" rev="3.3.0" conf="* -> *,!javadoc"/>

<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="* -> *,!sources,!javadoc" />
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="* -> *,!sources,!javadoc" />
<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="* -> *,!sources,!javadoc" />

<dependency org="org.apache.cassandra" name="cassandra-all" rev="0.8.6" conf="* -> *,!sources,!javadoc" />
<dependency org="net.java.dev.jna" name="jna" rev="3.2.7" conf="* -> *,!sources,!javadoc" />
<dependency org="org.xerial.snappy" name="snappy-java" rev="1.0.3.1" conf="* -> *,!sources,!javadoc" />
<dependency org="org.apache.cassandra" name="cassandra-all" rev="1.1.0-beta2" conf="* -> *,!sources,!javadoc" />

<!-- TODO: Added only because missing from the Cassandra pom. Can be deleted here when added by Cassandra. -->
<dependency org="com.yammer.metrics" name="metrics-core" rev="2.0.3" conf="* -> *,!sources,!javadoc"/>
<dependency org="edu.stanford.ppl" name="snaptree" rev="0.1" conf="* -> *,!sources,!javadoc"/>
</dependencies>
</ivy-module>

Loading