mirror of https://github.com/apache/cassandra
high-scale-lib upgrade
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
This commit is contained in:
parent
9881ea6b3e
commit
f0575f153b
|
|
@ -11,6 +11,7 @@ Merged from 1.2:
|
||||||
* Add Cloudstack snitch (CASSANDRA-7147)
|
* Add Cloudstack snitch (CASSANDRA-7147)
|
||||||
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
|
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
|
||||||
* Add Google Compute Engine snitch (CASSANDRA-7132)
|
* Add Google Compute Engine snitch (CASSANDRA-7132)
|
||||||
|
* Upgrade NBHM lib (CASSANDRA-7128)
|
||||||
|
|
||||||
2.1.0-beta2
|
2.1.0-beta2
|
||||||
* Increase default CL space to 8GB (CASSANDRA-7031)
|
* Increase default CL space to 8GB (CASSANDRA-7031)
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,5 @@ artifact.remoteRepository.java.net2: http://download.java.net/maven/2
|
||||||
artifact.remoteRepository.apache: https://repository.apache.org/content/repositories/releases
|
artifact.remoteRepository.apache: https://repository.apache.org/content/repositories/releases
|
||||||
artifact.remoteRepository.jclouds: http://jclouds.googlecode.com/svn/repo
|
artifact.remoteRepository.jclouds: http://jclouds.googlecode.com/svn/repo
|
||||||
artifact.remoteRepository.oauth: http://oauth.googlecode.com/svn/code/maven
|
artifact.remoteRepository.oauth: http://oauth.googlecode.com/svn/code/maven
|
||||||
|
artifact.remoteRepository.boundary: http://maven.boundary.com/artifactory/external
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -283,6 +283,7 @@
|
||||||
<artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>
|
<artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>
|
||||||
<artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
|
<artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
|
||||||
<artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>
|
<artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>
|
||||||
|
<artifact:remoteRepository id="boundary" url="${artifact.remoteRepository.boundary}"/>
|
||||||
|
|
||||||
<macrodef name="install">
|
<macrodef name="install">
|
||||||
<attribute name="pomFile"/>
|
<attribute name="pomFile"/>
|
||||||
|
|
@ -361,7 +362,7 @@
|
||||||
<exclusion groupId="junit" artifactId="junit"/>
|
<exclusion groupId="junit" artifactId="junit"/>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
|
<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.boundary.high-scale-lib" artifactId="high-scale-lib" version="1.0.5"/>
|
||||||
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
|
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
|
||||||
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
|
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
|
||||||
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
|
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
|
||||||
|
|
@ -470,7 +471,7 @@
|
||||||
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
|
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
|
||||||
<dependency groupId="jline" artifactId="jline"/>
|
<dependency groupId="jline" artifactId="jline"/>
|
||||||
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
|
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
|
||||||
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"/>
|
<dependency groupId="com.boundary.high-scale-lib" artifactId="high-scale-lib"/>
|
||||||
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
|
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
|
||||||
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
|
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
|
||||||
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
|
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
|
||||||
|
|
@ -542,6 +543,7 @@
|
||||||
<remoteRepository refid="central"/>
|
<remoteRepository refid="central"/>
|
||||||
<remoteRepository refid="apache"/>
|
<remoteRepository refid="apache"/>
|
||||||
<remoteRepository refid="java.net2"/>
|
<remoteRepository refid="java.net2"/>
|
||||||
|
<remoteRepository refid="boundary"/>
|
||||||
</artifact:dependencies>
|
</artifact:dependencies>
|
||||||
<artifact:dependencies pomRefId="coverage-deps-pom"
|
<artifact:dependencies pomRefId="coverage-deps-pom"
|
||||||
pathId="cobertura.classpath">
|
pathId="cobertura.classpath">
|
||||||
|
|
@ -567,6 +569,7 @@
|
||||||
<remoteRepository refid="apache"/>
|
<remoteRepository refid="apache"/>
|
||||||
<remoteRepository refid="central"/>
|
<remoteRepository refid="central"/>
|
||||||
<remoteRepository refid="oauth"/>
|
<remoteRepository refid="oauth"/>
|
||||||
|
<remoteRepository refid="boundary"/>
|
||||||
</artifact:dependencies>
|
</artifact:dependencies>
|
||||||
<copy todir="${test.lib}/jars">
|
<copy todir="${test.lib}/jars">
|
||||||
<fileset refid="test-dependency-jars"/>
|
<fileset refid="test-dependency-jars"/>
|
||||||
|
|
@ -587,6 +590,7 @@
|
||||||
<remoteRepository refid="apache"/>
|
<remoteRepository refid="apache"/>
|
||||||
<remoteRepository refid="central"/>
|
<remoteRepository refid="central"/>
|
||||||
<remoteRepository refid="java.net2"/>
|
<remoteRepository refid="java.net2"/>
|
||||||
|
<remoteRepository refid="boundary"/>
|
||||||
</artifact:dependencies>
|
</artifact:dependencies>
|
||||||
<copy todir="${build.dir.lib}/jars">
|
<copy todir="${build.dir.lib}/jars">
|
||||||
<fileset refid="test-dependency-jars"/>
|
<fileset refid="test-dependency-jars"/>
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue