Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allow the server to attempt starting up

  • Loading branch information...
commit 817d22b6a15f514c2c09d823e549dacf6e4280c6 1 parent 55ac05f
@benmccann benmccann authored
Showing with 10 additions and 10 deletions.
  1. +9 −9 ivy.xml
  2. +1 −1  resources/cassandra/solandra-env.sh
View
18 ivy.xml
@@ -20,26 +20,26 @@
<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="org.antlr" name="antlr" rev="3.4" conf="* -> *,!sources,!javadoc" />
+ <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="* -> *,!sources,!javadoc"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.6" 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.apache.lucene" name="lucene-core" rev="3.4.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="1.1.0-beta2" 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="net.java.dev.jna" name="jna" rev="3.4.0" conf="* -> *,!sources,!javadoc" />
+ <dependency org="org.xerial.snappy" name="snappy-java" rev="1.0.4.1" conf="* -> *,!sources,!javadoc" />
</dependencies>
</ivy-module>
View
2  resources/cassandra/solandra-env.sh
@@ -95,7 +95,7 @@ JVM_OPTS="$JVM_OPTS -ea"
check_openjdk=$(java -version 2>&1 | awk '{if (NR == 2) {print $1}}')
if [ "$check_openjdk" != "OpenJDK" ]
then
- JVM_OPTS="$JVM_OPTS -javaagent:$SOLANDRA_HOME/lib/jamm-0.2.2.jar"
+ JVM_OPTS="$JVM_OPTS -javaagent:$SOLANDRA_HOME/lib/jamm-0.2.5.jar"
fi
# enable thread priorities, primarily so we can give periodic tasks
Please sign in to comment.
Something went wrong with that request. Please try again.